From 18e3b9d7abe9210c74b321fda489a049795774a2 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 29 Aug 2024 13:30:18 +0700
Subject: add attrs to payment term po

---
 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 25b7787b..b936086a 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -39,7 +39,7 @@
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
                     <field name="count_line_product"/>
-                    <field name="payment_term_id" required="1"/>
+                    <field name="payment_term_id" required="1" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From 2719b8cdd45b356baa598255dcdbdd8e353478e7 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 30 Aug 2024 10:13:44 +0700
Subject: payment term po cr

---
 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 b936086a..c301f3d3 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -39,7 +39,7 @@
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
                     <field name="count_line_product"/>
-                    <field name="payment_term_id" required="1" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
+                    <field name="payment_term_id" readonly="1"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From ee22bb5c668c346c5f8ba2c4e148324dab0c6a3e Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 10 Sep 2024 10:27:15 +0700
Subject: bill dp

---
 indoteknik_custom/views/purchase_order.xml | 4 ++++
 1 file changed, 4 insertions(+)

(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 c301f3d3..9ded8308 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -26,6 +26,9 @@
                 <button name="button_unlock" position="after">
                     <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>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
                     <field name="sale_order"/>
@@ -88,6 +91,7 @@
                     <field name="from_apo"/>
                     <field name="approval_edit_line"/>
                     <field name="logbook_bill_id"/>
+                    <field name="bills_dp_id" readonly="1"/>
                 </field>
 
                 <field name="order_line" position="attributes">
-- 
cgit v1.2.3


From 1371df38b6818960e6e9520ae783f041694209d8 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 11 Sep 2024 13:39:13 +0700
Subject: ongkos kirim po

---
 indoteknik_custom/views/purchase_order.xml | 6 +++++-
 1 file changed, 5 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 9ded8308..6bc97bbf 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -37,7 +37,10 @@
                     <field name="amount_total_without_service"/>
                 </field>
                 <field name="approval_status" position="after">
-                    <field name="revisi_po" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
+                    <field name="revisi_po" invisible="1"/>
+                </field>
+                <field name="incoterm_id" position="after">
+                    <field name="delivery_amt"/>
                 </field>
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
@@ -45,6 +48,7 @@
                     <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 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