change logic of sales monitoring

1 files changed, 6 insertions, 10 deletions

diff --git a/indoteknik_custom/models/sale_monitoring.py b/indoteknik_custom/models/sale_monitoring.py
index ea1e490c..e79ff9ab 100755
--- a/indoteknik_custom/models/sale_monitoring.py
+++ b/indoteknik_custom/models/sale_monitoring.py
@@ -39,16 +39,12 @@ class SaleMonitoring(models.Model):
                     SUM(smd.qty_so_invoiced) AS qty_so_invoiced,
                     sum(smd.qty_reserved) as qty_reserved,
                     CASE
-                        WHEN SUM(qty_so) = SUM(qty_reserved) then 'SIAP KIRIM'
-                        WHEN SUM(qty_so) = SUM(qty_so_delivered) then 'Delivered'
-                        WHEN SUM(qty_so) = SUM(qty_so_invoiced) then 'Done'
-                        WHEN SUM(qty_reserved) < SUM(qty_so) and SUM(qty_reserved) > 0 THEN 'Belum PO full'
-                        WHEN SUM(qty_reserved) = SUM(qty_so) THEN 'Belum PO sama sekali'
-                        WHEN SUM(qty_po_received) < SUM(qty_so) AND SUM(qty_po_received) <= 0 THEN 'Belum Received sama sekali'
-                        WHEN SUM(qty_po_received) < SUM(qty_so) THEN 'Belum Received full'
-                        WHEN SUM(qty_to_delivered) = SUM(qty_so) THEN 'SIAP KIRIM'
-                        WHEN SUM(qty_to_delivered) < SUM(qty_so) and SUM(qty_to_delivered) > 0 THEN 'KIRIM SISANYA'
-                        ELSE 'Belum Invoiced' 
+                        when sum(qty_so_invoiced) = sum(qty_so) then 'Invoiced'
+                        when sum(qty_so_delivered) = sum(qty_so) then 'Delivered'
+                        when sum(qty_reserved) >= sum(qty_so) then 'Siap kirim'
+                        when sum(qty_po) + sum(qty_reserved) - sum(qty_po_received) < sum(qty_so) then 'Belum/Kurang PO'
+                        when sum(qty_po_received) = 0 then 'Belum terima'
+                        when sum(qty_po_received) < sum(qty_po) then 'Terima sebagian'
                     END AS status,
                     get_po_number(smd.sale_order_id) as po_number
                 FROM sale_monitoring_detail smd