diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2024-09-12 14:18:26 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2024-09-12 14:18:26 +0700 |
| commit | bd29d3fb44f693e950236b67b6a9a6ce64690505 (patch) | |
| tree | 3080d45fc81475f4f97d949f8b904345e7ab692a /indoteknik_custom/views | |
| parent | 9d28e451949bef17c40b1a188d4d744c17715925 (diff) | |
| parent | a37bc839612b5162b4446182ac23c1dfd1c3253e (diff) | |
Merge branch 'feature/margin-deduct-purchase-delivery' into production
Diffstat (limited to 'indoteknik_custom/views')
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 5 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 11b42147..ce127fdd 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -34,12 +34,12 @@ <field name="sale_order"/> <field name="is_create_uangmuka"/> <field name="approval_status"/> - <field name="amount_total_without_service"/> </field> <field name="approval_status" position="after"> <field name="revisi_po" invisible="1"/> </field> <field name="incoterm_id" position="after"> + <field name="amount_total_without_service"/> <field name="delivery_amt"/> </field> <field name="currency_id" position="after"> @@ -236,6 +236,9 @@ <field name="product_id"/> <field name="qty_so"/> <field name="qty_po"/> + <field name="margin_item" optional="hide"/> + <field name="delivery_amt" optional="hide"/> + <field name="margin_deduct" optional="hide"/> <field name="margin_so"/> </tree> </field> diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 58b67348..e772dcae 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -69,6 +69,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"/> |