From 1edd55b85c24b8f9a36349fa34793cb65a554851 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 15 Jun 2023 11:50:08 +0700
Subject: add qty reserved in sale monitoring and sale monitoring detail

---
 indoteknik_custom/views/sale_monitoring.xml        | 6 ++++--
 indoteknik_custom/views/sale_monitoring_detail.xml | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml
index b3b186e9..fffd140f 100755
--- a/indoteknik_custom/views/sale_monitoring.xml
+++ b/indoteknik_custom/views/sale_monitoring.xml
@@ -13,6 +13,7 @@
                 <field name="partner_id"/>
                 <field name="user_id"/>
                 <field name="qty_so"/>
+                <field name="qty_reserved"/>
                 <field name="qty_po"/>
                 <field name="qty_po_received"/>
                 <field name="qty_so_delivered"/>
@@ -22,7 +23,7 @@
                        decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
                        decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
                        decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced'"
+                       decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
                 />
             </tree>
         </field>
@@ -44,12 +45,13 @@
                                    decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
                                    decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
                                    decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced'"
+                                   decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
                             />
                             <field name="po_number"/>
                         </group>
                         <group>
                             <field name="qty_so"/>
+                            <field name="qty_reserved"/>
                             <field name="qty_po"/>
                             <field name="qty_po_received"/>
                             <field name="qty_so_delivered"/>
diff --git a/indoteknik_custom/views/sale_monitoring_detail.xml b/indoteknik_custom/views/sale_monitoring_detail.xml
index b9602abd..78bb92c7 100755
--- a/indoteknik_custom/views/sale_monitoring_detail.xml
+++ b/indoteknik_custom/views/sale_monitoring_detail.xml
@@ -11,6 +11,7 @@
                 <field name="user_id"/>
                 <field name="product_id"/>
                 <field name="qty_so"/>
+                <field name="qty_reserved"/>
                 <field name="qty_po"/>
                 <field name="qty_po_received"/>
                 <field name="qty_so_delivered"/>
@@ -20,7 +21,7 @@
                        decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
                        decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
                        decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced' or status == 'Done'"
+                       decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
                 />
             </tree>
         </field>
@@ -43,11 +44,12 @@
                                    decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
                                    decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
                                    decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced'"
+                                   decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
                             />
                         </group>
                         <group>
                             <field name="qty_so"/>
+                            <field name="qty_reserved"/>
                             <field name="qty_po"/>
                             <field name="qty_po_received"/>
                             <field name="qty_so_delivered"/>
-- 
cgit v1.2.3


From d32accf86a2baffcf7ce90554d1f8868ab518cf4 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 15 Jun 2023 15:07:24 +0700
Subject: change logic of sales monitoring

---
 indoteknik_custom/views/sale_monitoring.xml        | 16 ++++++++--------
 indoteknik_custom/views/sale_monitoring_detail.xml | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml
index fffd140f..956e4a24 100755
--- a/indoteknik_custom/views/sale_monitoring.xml
+++ b/indoteknik_custom/views/sale_monitoring.xml
@@ -20,10 +20,10 @@
                 <field name="qty_so_invoiced"/>
                 <field name="status"
                        widget="badge"
-                       decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                       decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                       decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
+                       decoration-danger="status == 'Belum/Kurang PO'"
+                        decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                        decoration-success="status == 'Siap kirim'"
+                        decoration-info="status == 'Delivered' or status == 'Invoiced'"
                 />
             </tree>
         </field>
@@ -42,10 +42,10 @@
                             <field name="user_id"/>
                             <field name="status"
                                    widget="badge"
-                                   decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                                   decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                                   decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
+                                   decoration-danger="status == 'Belum/Kurang PO'"
+                                   decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                                   decoration-success="status == 'Siap kirim'"
+                                   decoration-info="status == 'Delivered' or status == 'Invoiced'"
                             />
                             <field name="po_number"/>
                         </group>
diff --git a/indoteknik_custom/views/sale_monitoring_detail.xml b/indoteknik_custom/views/sale_monitoring_detail.xml
index 78bb92c7..736920b3 100755
--- a/indoteknik_custom/views/sale_monitoring_detail.xml
+++ b/indoteknik_custom/views/sale_monitoring_detail.xml
@@ -18,10 +18,10 @@
                 <field name="qty_so_invoiced"/>
                 <field name="status"
                        widget="badge"
-                       decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                       decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                       decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
+                       decoration-danger="status == 'Belum/Kurang PO'"
+                       decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                       decoration-success="status == 'Siap kirim'"
+                       decoration-info="status == 'Delivered' or status == 'Invoiced'"
                 />
             </tree>
         </field>
@@ -41,10 +41,10 @@
                             <field name="product_id"/>
                             <field name="status"
                                    widget="badge"
-                                   decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                                   decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                                   decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced' or status == 'Done' or status == 'Delivered'"
+                                   decoration-danger="status == 'Belum/Kurang PO'"
+                                   decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                                   decoration-success="status == 'Siap kirim'"
+                                   decoration-info="status == 'Delivered' or status == 'Invoiced'"
                             />
                         </group>
                         <group>
-- 
cgit v1.2.3


From 92fae861a362ad49bb299ceeac62d517108880de Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 16 Jun 2023 08:52:48 +0700
Subject: Update sale_order shipping paid by and shipping cost covered required
 when create_date > 2023-06-15

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index ea13c954..53740dd5 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -19,8 +19,9 @@
                         type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
                 <field name="payment_term_id" position="after">
-                    <field name="shipping_cost_covered" required="1"/>
-                    <field name="shipping_paid_by" required="1"/>
+                    <field name="create_date" invisible="1"/>
+                    <field name="shipping_cost_covered" attrs="{'required': [('create_date', '&gt;', '2023-06-15')]}"/>
+                    <field name="shipping_paid_by" attrs="{'required': [('create_date', '&gt;', '2023-06-15')]}"/>
                     <field name="delivery_amt"/>
                     <field name="fee_third_party"/>
                     <field name="total_percent_margin"/>
-- 
cgit v1.2.3


From d22fb25a88cacabd470780588c200c065e0633cd Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 16 Jun 2023 09:28:11 +0700
Subject: add filter sale monitoring

---
 indoteknik_custom/views/sale_monitoring.xml        | 15 +++++++++++++++
 indoteknik_custom/views/sale_monitoring_detail.xml | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml
index 956e4a24..0a9a5aa5 100755
--- a/indoteknik_custom/views/sale_monitoring.xml
+++ b/indoteknik_custom/views/sale_monitoring.xml
@@ -63,10 +63,25 @@
         </field>
     </record>
 
+    <record id="view_monitoring_filter" model="ir.ui.view">
+        <field name="name">sale.monitoring.list.select</field>
+        <field name="model">sale.monitoring</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Monitoring">
+                <field name="sale_order_id"/>
+                <field name="partner_id"/>
+                <field name="user_id"/>
+                <field name="status"/>
+           </search>
+        </field>
+    </record>
+
     <record id="sale_monitoring_action" model="ir.actions.act_window">
         <field name="name">Sale Monitoring</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.monitoring</field>
+        <field name="search_view_id" ref="view_monitoring_filter"/>
         <field name="view_mode">tree,form</field>
     </record>
 
diff --git a/indoteknik_custom/views/sale_monitoring_detail.xml b/indoteknik_custom/views/sale_monitoring_detail.xml
index 736920b3..824e65e8 100755
--- a/indoteknik_custom/views/sale_monitoring_detail.xml
+++ b/indoteknik_custom/views/sale_monitoring_detail.xml
@@ -61,10 +61,26 @@
         </field>
     </record>
 
+    <record id="view_monitoring_detail_filter" model="ir.ui.view">
+        <field name="name">sale.monitoring.detail.list.select</field>
+        <field name="model">sale.monitoring.detail</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Monitoring">
+                <field name="sale_order_id"/>
+                <field name="partner_id"/>
+                <field name="user_id"/>
+                <field name="product_id"/>
+                <field name="status"/>
+           </search>
+        </field>
+    </record>
+
     <record id="sale_monitoring_detail_action" model="ir.actions.act_window">
         <field name="name">Sale Monitoring Detail</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.monitoring.detail</field>
+        <field name="search_view_id" ref="view_monitoring_detail_filter"/>
         <field name="view_mode">tree,form</field>
     </record>
 
-- 
cgit v1.2.3


From fd63ff133764477f39c9dd32c5177dd67f293abb Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 16 Jun 2023 11:36:00 +0700
Subject: optional hide for line no in sale and purchase

---
 indoteknik_custom/views/purchase_order.xml | 2 +-
 indoteknik_custom/views/sale_order.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index a4c77c58..7a397ff6 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -43,7 +43,7 @@
                     <field name="total_so_percent_margin"/>
                 </field>
                 <field name="product_id" position="before">
-                    <field name="line_no" attrs="{'readonly': 1}"/>
+                    <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
                 </field>
                 <field name="product_qty" position="before">
                     <field name="qty_available_store"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 53740dd5..94073fd7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -63,7 +63,7 @@
                     <field name="item_percent_margin"/>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
-                    <field name="line_no" readonly="1"/>
+                    <field name="line_no" readonly="1" optional="hide"/>
                 </xpath>
                 <field name="amount_total" position="after">
                     <field name="grand_total"/>
-- 
cgit v1.2.3


From e2ccd5719de9cf03a422e93fbef9a7f035b854a5 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 16 Jun 2023 15:59:46 +0700
Subject: Fix shipping cost and paid by required when create_date false or
 greater than 15 Juni 2023

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 94073fd7..b160d9b1 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -20,8 +20,8 @@
                 </button>
                 <field name="payment_term_id" position="after">
                     <field name="create_date" invisible="1"/>
-                    <field name="shipping_cost_covered" attrs="{'required': [('create_date', '&gt;', '2023-06-15')]}"/>
-                    <field name="shipping_paid_by" attrs="{'required': [('create_date', '&gt;', '2023-06-15')]}"/>
+                    <field name="shipping_cost_covered" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
+                    <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="total_percent_margin"/>
-- 
cgit v1.2.3