Merge branch 'production' into feature/max_plafon_order_qty

1 files changed, 15 insertions, 18 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 4c9d7658..1906dae0 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -192,9 +192,9 @@ class StockPicking(models.Model):
         else:
             raise UserError(f"Error saat mengirim ke Biteship: {response.content}")
     
-    @api.constrains('driver_departure_date')
-    def constrains_driver_departure_date(self): 
-        self.date_doc_kirim = self.driver_departure_date
+    # @api.constrains('driver_departure_date')
+    # def constrains_driver_departure_date(self): 
+    #     self.date_doc_kirim = self.driver_departure_date
 
     @api.constrains('arrival_time')
     def constrains_arrival_time(self):
@@ -246,25 +246,22 @@ class StockPicking(models.Model):
     #                 break
 
     def check_state_reserve(self):
-        picking = self.search([
+        pickings = self.search([
             ('state', 'not in', ['cancel', 'draft', 'done']),
             ('picking_type_code', '=', 'outgoing')
-            ])
+        ])
         
-        for data in picking:
-            fullfilment = self.env['sales.order.fullfillment'].search([
-                ('sales_order_id', '=', data.sale_id.id)
+        for picking in pickings:
+            fullfillments = self.env['sales.order.fullfillment'].search([
+                ('sales_order_id', '=', picking.sale_id.id)
             ])
-
-            data.state_reserve = 'ready'
-            if not data.date_reserved:
-                data.date_reserved = datetime.datetime.utcnow()
-                
-            for rec in fullfilment:
-                if rec.reserved_from not in ['Inventory On Hand', 'Reserved from stock', 'Free Stock']:
-                    data.state_reserve = 'waiting'
-                    data.date_reserved = ''
-                    break
+            
+            picking.state_reserve = 'ready'
+            picking.date_reserved = picking.date_reserved or datetime.datetime.utcnow()
+            
+            if any(rec.reserved_from not in ['Inventory On Hand', 'Reserved from stock', 'Free Stock'] for rec in fullfillments):
+                picking.state_reserve = 'waiting'
+                picking.date_reserved = ''
     
     def _create_approval_notification(self, approval_role):
         title = 'Warning'