diff options
| author | Miqdad <ahmadmiqdad27@gmail.com> | 2025-06-18 10:36:17 +0700 |
|---|---|---|
| committer | Miqdad <ahmadmiqdad27@gmail.com> | 2025-06-18 10:36:17 +0700 |
| commit | fe8c7bf1903242610d99381b5109506294648d10 (patch) | |
| tree | 2b77e018dee5eaa5b93b66c691a84055ef7806e3 /indoteknik_custom/views | |
| parent | 968d9987eb53670f0d96209e77debb1196f9b939 (diff) | |
| parent | f4486625017ee5edae369a6be283863a30066b3b (diff) | |
Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into tukar_guling
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/customer_commision.xml | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/res_partner.xml | 4 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 37df16ff..4be0840f 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -81,6 +81,8 @@ <field name="commision_percent"/> <field name="commision_amt"/> <field name="commision_amt_text"/> + <field name="cashback" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/> + <field name="total_commision" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/> <field name="grouped_so_number" readonly="1"/> <field name="grouped_invoice_number" readonly="1"/> <field name="approved_by" readonly="1"/> diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index 2a4b03a7..30b5ca36 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -67,9 +67,9 @@ </group> <xpath expr="//notebook/page[@name='contact_addresses']" position="before"> <page string="Pin Point Location" name="map_location"> - <!-- <group> + <group> <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/> - </group> --> + </group> <div style="margin: 16px 0;"> <field name="map_view" widget="googlemap" nolabel="1"/> </div> diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index fbca3705..d0442677 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -305,14 +305,12 @@ </field> <field name="select_shipping_option" position="attributes"> <attribute name="attrs"> - {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in', - ['cancel','draft'])]} + {'readonly': [('state', 'in', ['cancel', 'done'])]} </attribute> </field> <field name="carrier_id" position="attributes"> <attribute name="attrs"> - {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in', - ['cancel', 'draft'])]} + {'readonly': [('state', 'in', ['cancel', 'done'])]} </attribute> </field> <field name="payment_term_id" position="attributes"> |