From a37bc839612b5162b4446182ac23c1dfd1c3253e Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 12 Sep 2024 14:17:36 +0700
Subject: calculate margin after purchase delivery deduction

---
 indoteknik_custom/views/purchase_order.xml | 5 ++++-
 indoteknik_custom/views/sale_order.xml     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 6bc97bbf..346b31a5 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">
@@ -237,6 +237,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"/>
-- 
cgit v1.2.3