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_detail.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

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_detail.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

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