diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-09-26 10:20:59 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-09-26 10:20:59 +0700 |
| commit | 25a3271bd14671d57da6b4349745e446e94ebfef (patch) | |
| tree | d5a6554c61a02cd08f41c8068237a926e29874dd /indoteknik_custom/views/sale_order.xml | |
| parent | bd8a83a76cea6ef2466c250226f7c95c38b3024c (diff) | |
| parent | 50b5bd7bd984ef108e8bd324440050a222d8262f (diff) | |
Merge branch 'change/feature/promotion-program' into production
# 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 | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 1e83d4b4..4f413d44 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -92,7 +92,7 @@ <field name="note_procurement" optional="hide"/> <field name="vendor_subtotal" optional="hide"/> <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/> - <field name="program_line_id" optional="1" /> + <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/> </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before"> <field name="line_no" readonly="1" optional="hide"/> @@ -113,6 +113,7 @@ <field name="effective_date" position="after"> <field name="carrier_id"/> <field name="estimated_arrival_days"/> + <field name="picking_iu_id"/> </field> <page name="customer_signature" position="after"> @@ -135,6 +136,22 @@ </group> </group> </page> + <page string="Promotion" name="page_promotion"> + <field name="order_promotion_ids" readonly="1"> + <tree options="{'no_open': True}"> + <field name="program_line_id" /> + <field name="quantity" /> + <field name="is_applied" /> + </tree> + <form> + <group> + <field name="program_line_id" /> + <field name="quantity" /> + <field name="is_applied" /> + </group> + </form> + </field> + </page> </page> </field> |