From bc89a3ae2ac20a53d46d8e50da4a3427f44bd870 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 8 May 2025 13:41:03 +0700
Subject: push

---
 indoteknik_custom/views/shipment_group.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index e9eec41b..d2c661ba 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -7,6 +7,8 @@
             <tree default_order="create_date desc">
                 <field name="number"/>
                 <field name="partner_id"/>
+                <field name="carrier_id"/>
+                <field name="total_colly_line"/>
             </tree>
         </field>
     </record>
@@ -16,11 +18,9 @@
         <field name="model">shipment.group.line</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
-                <field name="picking_id" required="1"/>
-                <field name="partner_id" readonly="1"/>
                 <field name="sale_id" readonly="1"/>
-                <field name="shipping_paid_by" readonly="1"/>
-                <field name="state" readonly="1"/>
+                <field name="picking_id" required="1"/>
+                <field name="total_colly" readonly="1"/>
             </tree>
         </field>
     </record>
@@ -37,6 +37,8 @@
                         </group>
                         <group>
                             <field name="partner_id" readonly="1"/> 
+                            <field name="carrier_id" readonly="1"/> 
+                            <field name="total_colly_line" readonly="1"/> 
                         </group>
                     </group>
                     <notebook>
-- 
cgit v1.2.3


From 4360e1fd9f3af2c18b19463773047d9939716069 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 16 May 2025 09:27:25 +0700
Subject: revisi shipment group

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

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

diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index d2c661ba..a4f82e27 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -18,8 +18,9 @@
         <field name="model">shipment.group.line</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
-                <field name="sale_id" readonly="1"/>
+                <field name="partner_id" readonly="1"/>
                 <field name="picking_id" required="1"/>
+                <field name="sale_id" readonly="1"/>
                 <field name="total_colly" readonly="1"/>
             </tree>
         </field>
-- 
cgit v1.2.3


From 8ac8c2f8b89e6069bf13e879d486fa9cf4814cb4 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 27 May 2025 09:02:47 +0700
Subject: push cr shipment group, vendor approval and purchase order

---
 indoteknik_custom/views/shipment_group.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index a4f82e27..ea202ee2 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -30,6 +30,13 @@
         <field name="name">shipment.group.form</field>
         <field name="model">shipment.group</field>
         <field name="arch" type="xml">
+            <header>
+                <button name="sync_api_shipping"
+                        string="Sync API"
+                        type="object"
+                        attrs="{'invisible': [('carrier_id', 'not in', [151, 173])]}"
+                />
+            </header>
             <form>
                 <sheet>
                     <group>
-- 
cgit v1.2.3


From d3f530b94569059106164172485aaa9665e80709 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 27 May 2025 09:22:54 +0700
Subject: fix header

---
 indoteknik_custom/views/shipment_group.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index ea202ee2..c3f79bda 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -30,14 +30,14 @@
         <field name="name">shipment.group.form</field>
         <field name="model">shipment.group</field>
         <field name="arch" type="xml">
-            <header>
-                <button name="sync_api_shipping"
-                        string="Sync API"
-                        type="object"
-                        attrs="{'invisible': [('carrier_id', 'not in', [151, 173])]}"
-                />
-            </header>
             <form>
+                <header>
+                    <button name="sync_api_shipping"
+                            string="Sync API"
+                            type="object"
+                            attrs="{'invisible': [('carrier_id', 'not in', [151, 173])]}"
+                    />
+                </header>
                 <sheet>
                     <group>
                         <group>
-- 
cgit v1.2.3