From 9d28e451949bef17c40b1a188d4d744c17715925 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 12 Sep 2024 14:00:12 +0700
Subject: cr po

---
 indoteknik_custom/views/purchase_order.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indoteknik_custom/views/purchase_order.xml')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 6bc97bbf..11b42147 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -48,7 +48,6 @@
                     <field name="payment_term_id" readonly="1"/>
                 </field>
                 <field name="amount_total" position="after">
-                    <field name="grand_total"/>
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
                     <field name="total_percent_margin"/>
-- 
cgit v1.2.3


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 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views/purchase_order.xml')

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>
-- 
cgit v1.2.3


From 8da0163ea3fdc87eff8214a9fda4f2594404b4e3 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 21 Sep 2024 13:21:36 +0700
Subject: cr bill dp

---
 indoteknik_custom/views/purchase_order.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views/purchase_order.xml')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index ce127fdd..80c0ebf5 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -27,7 +27,7 @@
                     <button name="delete_line" type="object" string="Delete " states="draft"/>
                 </button>
                 <button name="button_unlock" position="after">
-                    <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}"/>
+                    <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done'))"/>
                 </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
-- 
cgit v1.2.3


From 24d8b692fe8f85d638da0c9d4fbc22a860464ed9 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 21 Sep 2024 13:23:39 +0700
Subject: fix error

---
 indoteknik_custom/views/purchase_order.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views/purchase_order.xml')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 80c0ebf5..0ef0aa7f 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -27,7 +27,7 @@
                     <button name="delete_line" type="object" string="Delete " states="draft"/>
                 </button>
                 <button name="button_unlock" position="after">
-                    <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done'))"/>
+                    <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" attrs="{'invisible': [('state', 'not in', ('purchase', 'done'))]}"/>
                 </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
-- 
cgit v1.2.3