diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-09-24 09:03:52 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-09-24 09:03:52 +0700 |
| commit | cc4be72fc2f0d98f8bc2190ea5c404536bb3c56d (patch) | |
| tree | a00f22741ba1ec63b59659834a9c6177b20db343 /indoteknik_custom/views/sale_order.xml | |
| parent | 1f9d0136758531831ea6c7a90556c9a472ed8d40 (diff) | |
| parent | 649f3037e4357dab42d1a8d799e5f2a2f1fd2e52 (diff) | |
Merge branch 'production' into unreserved_permission
# Conflicts:
# indoteknik_custom/models/sale_order.py
Diffstat (limited to 'indoteknik_custom/views/sale_order.xml')
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 83474df7..3b8a7d1f 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -32,6 +32,7 @@ <field name="delivery_amt"/> <field name="fee_third_party"/> <field name="total_percent_margin"/> + <field name="type_promotion"/> <label for="voucher_id"/> <div class="o_row"> <field name="voucher_id" id="voucher_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/> @@ -69,6 +70,8 @@ <field name="tag_ids" position="after"> <field name="eta_date" readonly="1"/> <field name="flash_sale"/> + <field name="margin_after_delivery_purchase"/> + <field name="percent_margin_after_delivery_purchase"/> </field> <field name="analytic_account_id" position="after"> <field name="customer_type" required="1"/> |