cr stock picking

1 files changed, 8 insertions, 4 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index ef26e002..50e9304b 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -520,8 +520,9 @@ class StockPicking(models.Model):
 
 
     def button_validate(self):
-        if not self.env.user.is_logistic_approver and 'Return of' in self.origin:
-            raise UserError("Button ini hanya untuk Logistik")
+        if not self.env.user.is_logistic_approver and self.env.context.get('active_model') == 'stock.picking':
+            if self.origin and 'Return of' in self.origin:
+                raise UserError("Button ini hanya untuk Logistik")
 
         if self._name != 'stock.picking':
             return super(StockPicking, self).button_validate()
@@ -574,11 +575,14 @@ class StockPicking(models.Model):
         self.state_reserve = 'done'
         return res
     def action_cancel(self):
-        if not self.env.user.is_logistic_approver and 'Return of' in self.origin:
-            raise UserError("Button ini hanya untuk Logistik")
+        if not self.env.user.is_logistic_approver and self.env.context.get('active_model') == 'stock.picking':
+            if self.origin and 'Return of' in self.origin:
+                raise UserError("Button ini hanya untuk Logistik")
+
         res = super(StockPicking, self).action_cancel()
         return res
 
+
     @api.model
     def create(self, vals):
         self._use_faktur(vals)