Merge branch 'feature/rest-api' into staging

1 files changed, 12 insertions, 2 deletions

diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index c3f3dccb..7ce8ff61 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -24,9 +24,19 @@ class SaleOrder(models.Model):
                 data['status'] = 'waiting'
         if sale_order.state == 'sale': 
             data['status'] = 'sale'
+            picking_count = {
+                'assigned': 0,
+                'done': 0,
+            }
             for picking in sale_order.picking_ids:
-                if picking.state == 'assigned':
-                    data['status'] = 'shipping'
+                if picking.state in ['confirmed', 'assigned']:
+                    picking_count['assigned'] += 1
+                if picking.state == 'done':
+                    picking_count['done'] += 1
+            if picking_count['assigned'] > 0:
+                data['status'] = 'shipping'
+                if picking_count['done'] > 0:
+                    data['status'] = 'partial_shipping'
         if sale_order.state == 'done': 
             data['status'] = 'done'