cr stock_picking

1 files changed, 6 insertions, 1 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 68e94ef7..430c54f3 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -196,7 +196,8 @@ class StockPicking(models.Model):
     
     @api.constrains('driver_departure_date')
     def constrains_driver_departure_date(self): 
-        self.date_doc_kirim = self.driver_departure_date
+        if not self.date_doc_kirim:  
+            self.date_doc_kirim = self.driver_departure_date
 
     @api.constrains('arrival_time')
     def constrains_arrival_time(self):
@@ -450,6 +451,8 @@ class StockPicking(models.Model):
                             'picking_ids': [x.id for x in self]
                         }
                         return action
+                    elif not self.env.user.id in [3988, 3401, 20] and 'Return of' in self.origin:
+                        raise UserError('Harus Purchasing yang Ask Return')
                     else:
                         raise UserError('Harus Sales Admin yang Ask Return')
                 elif self.picking_type_code == 'incoming':
@@ -459,6 +462,8 @@ class StockPicking(models.Model):
                             'picking_ids': [x.id for x in self]
                         }
                         return action
+                    elif not self.env.user.has_group('indoteknik_custom.group_role_purchasing') and 'Return of' in self.origin:
+                        raise UserError('Harus Sales Admin yang Ask Return')
                     else:
                         raise UserError('Harus Purchasing yang Ask Return')