From 351580ed5c3266a7fc956eb77efa1d2d2d0c5d57 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 12 Mar 2025 13:28:29 +0700
Subject: cr estimate shipping price

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index ebee64b1..0d190f37 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -100,6 +100,7 @@
                     <field name="sales_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
                     <field name="carrier_id" required="1"/>
                     <field name="delivery_service_type" readonly="1"/>
+                    <field name="shipping_option_id"/>
                 </field>
                 <field name="medium_id" position="after">
                     <field name="date_doc_kirim" readonly="1"/>
-- 
cgit v1.2.3


From 731a47bee9925d65afe45f870880e9a42104fe7f Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 13 Mar 2025 08:54:55 +0700
Subject: add grouped so number and invoice number on customer commision

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 51172b1c..bb1628bc 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -17,6 +17,8 @@
                     decoration-danger="payment_status == 'pending'"
                     widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
+                <field name="grouped_so_number" readonly="1"/>
+                <field name="grouped_invoice_number" readonly="1"/>
             </tree>
         </field>
     </record>
@@ -62,6 +64,8 @@
                                 <field name="description"/>
                                 <field name="commision_percent"/>
                                 <field name="commision_amt"/>
+                                <field name="grouped_so_number" readonly="1"/>
+                                <field name="grouped_invoice_number" readonly="1"/>
                             </group>
                             <group>
                                 <div>
-- 
cgit v1.2.3


From 0f962b64b4c62e236d6096c594d7fbe8c49276d8 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 11:50:08 +0700
Subject: <iman> md selish

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index dadd5021..d6ec4d3b 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -19,7 +19,8 @@
                     <field name="note" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
-                    <field name="final_seq"/> 
+                    <field name="final_seq"/>
+                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -70,6 +71,17 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
+                   <button name="button_state_approve_md"
+                            string="Approve MD Gudang Selisih"
+                            type="object"
+                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"
+                    />
+
+                    <button name="button_state_pending_md"
+                            string="Pending MD Gudang Selisih"
+                            type="object"
+                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
@@ -97,6 +109,8 @@
                     <field name="arrival_time"/>
                 </field>
                 <field name="origin" position="after">
+                    <field name="show_state_approve_md" invisible="1" optional="hide"/>
+                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-- 
cgit v1.2.3


From 53501956695d6fcc881125cff69e8e5cc9ebf2f5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 21:05:37 +0700
Subject: <iman> fix code

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index d6ec4d3b..ef56eec9 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -20,7 +20,7 @@
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="final_seq"/>
-                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
+<!--                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />-->
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
-- 
cgit v1.2.3


From e3ee409885f0b5ec1f1c229b2acec5f8b752c750 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 21:08:09 +0700
Subject: <iman> fix code

---
 indoteknik_custom/views/stock_picking.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ef56eec9..ce07888a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -71,17 +71,17 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
-                   <button name="button_state_approve_md"
-                            string="Approve MD Gudang Selisih"
-                            type="object"
-                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"
-                    />
+<!--                   <button name="button_state_approve_md"-->
+<!--                            string="Approve MD Gudang Selisih"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"-->
+<!--                    />-->
 
-                    <button name="button_state_pending_md"
-                            string="Pending MD Gudang Selisih"
-                            type="object"
-                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
-                    />
+<!--                    <button name="button_state_pending_md"-->
+<!--                            string="Pending MD Gudang Selisih"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"-->
+<!--                    />-->
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
@@ -109,8 +109,8 @@
                     <field name="arrival_time"/>
                 </field>
                 <field name="origin" position="after">
-                    <field name="show_state_approve_md" invisible="1" optional="hide"/>
-                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>
+<!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
+<!--                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>-->
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-- 
cgit v1.2.3


From 59dd3804fff70606c82db6a990973f396fe9fb0f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 21:09:58 +0700
Subject: <iman> add xml

---
 indoteknik_custom/views/stock_picking.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ce07888a..d6ec4d3b 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -20,7 +20,7 @@
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="final_seq"/>
-<!--                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />-->
+                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -71,17 +71,17 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
-<!--                   <button name="button_state_approve_md"-->
-<!--                            string="Approve MD Gudang Selisih"-->
-<!--                            type="object"-->
-<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"-->
-<!--                    />-->
+                   <button name="button_state_approve_md"
+                            string="Approve MD Gudang Selisih"
+                            type="object"
+                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"
+                    />
 
-<!--                    <button name="button_state_pending_md"-->
-<!--                            string="Pending MD Gudang Selisih"-->
-<!--                            type="object"-->
-<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"-->
-<!--                    />-->
+                    <button name="button_state_pending_md"
+                            string="Pending MD Gudang Selisih"
+                            type="object"
+                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
@@ -109,8 +109,8 @@
                     <field name="arrival_time"/>
                 </field>
                 <field name="origin" position="after">
-<!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
-<!--                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>-->
+                    <field name="show_state_approve_md" invisible="1" optional="hide"/>
+                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-- 
cgit v1.2.3


From a12ed493887c4499f733f450a5ef826ee85b086e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 21:13:57 +0700
Subject: <iman> back to code xml

---
 indoteknik_custom/views/stock_picking.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index d6ec4d3b..ce07888a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -20,7 +20,7 @@
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="final_seq"/>
-                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
+<!--                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />-->
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -71,17 +71,17 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
-                   <button name="button_state_approve_md"
-                            string="Approve MD Gudang Selisih"
-                            type="object"
-                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"
-                    />
+<!--                   <button name="button_state_approve_md"-->
+<!--                            string="Approve MD Gudang Selisih"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"-->
+<!--                    />-->
 
-                    <button name="button_state_pending_md"
-                            string="Pending MD Gudang Selisih"
-                            type="object"
-                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
-                    />
+<!--                    <button name="button_state_pending_md"-->
+<!--                            string="Pending MD Gudang Selisih"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"-->
+<!--                    />-->
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
@@ -109,8 +109,8 @@
                     <field name="arrival_time"/>
                 </field>
                 <field name="origin" position="after">
-                    <field name="show_state_approve_md" invisible="1" optional="hide"/>
-                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>
+<!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
+<!--                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>-->
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-- 
cgit v1.2.3


From 61cec7a1d3595f661ba0fa1551e94f05ab0f27a2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 22:10:20 +0700
Subject: <iman> fix code

---
 indoteknik_custom/views/stock_picking.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ce07888a..687b2b82 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -20,7 +20,7 @@
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="final_seq"/>
-<!--                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />-->
+                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -71,17 +71,17 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
-<!--                   <button name="button_state_approve_md"-->
-<!--                            string="Approve MD Gudang Selisih"-->
-<!--                            type="object"-->
-<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"-->
-<!--                    />-->
+                   <button name="button_state_approve_md"
+                            string="Approve MD Gudang Selisih"
+                            type="object"
+                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"
+                    />
 
-<!--                    <button name="button_state_pending_md"-->
-<!--                            string="Pending MD Gudang Selisih"-->
-<!--                            type="object"-->
-<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"-->
-<!--                    />-->
+                    <button name="button_state_pending_md"
+                            string="Pending MD Gudang Selisih"
+                            type="object"
+                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
-- 
cgit v1.2.3


From f275ebcd3813e9ea7af4b61f8bb48d030ad0ccc0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Mar 2025 22:12:44 +0700
Subject: <iman> back to code

---
 indoteknik_custom/views/stock_picking.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 687b2b82..ce07888a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -20,7 +20,7 @@
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="final_seq"/>
-                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
+<!--                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />-->
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -71,17 +71,17 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
-                   <button name="button_state_approve_md"
-                            string="Approve MD Gudang Selisih"
-                            type="object"
-                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"
-                    />
+<!--                   <button name="button_state_approve_md"-->
+<!--                            string="Approve MD Gudang Selisih"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"-->
+<!--                    />-->
 
-                    <button name="button_state_pending_md"
-                            string="Pending MD Gudang Selisih"
-                            type="object"
-                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
-                    />
+<!--                    <button name="button_state_pending_md"-->
+<!--                            string="Pending MD Gudang Selisih"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"-->
+<!--                    />-->
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
-- 
cgit v1.2.3