From 99b252edaefc372fcd4ef59e065284d8feeb669c Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 19 Feb 2025 09:38:46 +0700
Subject: push

---
 indoteknik_custom/views/sale_order.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 008a04ed..877208b0 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -280,6 +280,9 @@
                     <page string="Reject Line" name="page_sale_order_reject_line">
                         <field name="reject_line" readonly="1"/>
                     </page>
+                    <page string="Koli" name="page_sales_order_koli_line">
+                        <field name="koli_lines" readonly="1"/>
+                    </page>
                 </page>
             </field>
         </record>
@@ -391,6 +394,18 @@
         </record>
     </data>
 
+    <data>
+        <record id="sales_order_koli_tree" model="ir.ui.view">
+            <field name="name">sales.order.koli.tree</field>
+            <field name="model">sales.order.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="top" create="false" delete="false">
+                    <field name="koli_id" readonly="1"/>
+                </tree>
+            </field>
+        </record>
+    </data>
+
     <data>
 
     </data>
-- 
cgit v1.2.3


From c1810b315d820a184db47d551b39700ce00d1440 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 24 Feb 2025 09:57:56 +0700
Subject: push wms

---
 indoteknik_custom/views/sale_order.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 877208b0..4d31b072 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -401,6 +401,8 @@
             <field name="arch" type="xml">
                 <tree editable="top" create="false" delete="false">
                     <field name="koli_id" readonly="1"/>
+                    <field name="picking_id" readonly="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From aada0aa508549c9357cdee1a16cd7a23d6a38b22 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 26 Mar 2025 11:33:57 +0700
Subject: push

---
 indoteknik_custom/views/sale_order.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0d190f37..db89d121 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -31,7 +31,9 @@
                     <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
                     <field name="delivery_amt"/>
                     <field name="fee_third_party"/>
+                    <field name="biaya_lain_lain"/>
                     <field name="total_percent_margin"/>
+                    <field name="total_margin_excl_third_party"/>
                     <field name="type_promotion"/>
                     <label for="voucher_id"/>
                     <div class="o_row">
-- 
cgit v1.2.3


From cefc6ec6de52f2c79c1760cf88db3375f4956a31 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 26 Mar 2025 13:48:25 +0700
Subject: PUSH

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

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

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index db89d121..74730e06 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -33,7 +33,7 @@
                     <field name="fee_third_party"/>
                     <field name="biaya_lain_lain"/>
                     <field name="total_percent_margin"/>
-                    <field name="total_margin_excl_third_party"/>
+                    <field name="total_margin_excl_third_party" readonly="1"/>
                     <field name="type_promotion"/>
                     <label for="voucher_id"/>
                     <div class="o_row">
-- 
cgit v1.2.3