Merge branch 'production' into feature/generate_url

1 files changed, 5 insertions, 5 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 340df49e..f8af409f 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -508,11 +508,11 @@ class PurchaseOrder(models.Model):
         if self.amount_untaxed >= 50000000 and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
             raise UserError("Hanya Merchandiser yang bisa approve")
             
-        if self.total_percent_margin < self.total_so_percent_margin and not self.env.user.is_purchasing_manager and not self.env.user.is_leader:
-            raise UserError("Beda Margin dengan Sales, harus approval Manager")
+        if self.total_percent_margin < self.total_so_percent_margin and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser') and not self.env.user.is_leader:
+            raise UserError("Beda Margin dengan Sales, harus approval Merchandise")
         if not self.from_apo:
-            if not self.sale_order_id and not self.env.user.is_purchasing_manager and not self.env.user.is_leader:
-                raise UserError("Tidak ada link dengan SO, harus approval Manager")
+            if not self.sale_order_id and self.env.user.has_group('indoteknik_custom.group_role_merchandiser') and not self.env.user.is_leader:
+                raise UserError("Tidak ada link dengan SO, harus approval Merchandise")
             
         send_email = False
         self.add_product_to_pricelist()
@@ -641,7 +641,7 @@ class PurchaseOrder(models.Model):
     def po_approve(self):
         if self.amount_untaxed >= 50000000 and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
             raise UserError("Hanya Merchandiser yang bisa approve")
-        if self.env.user.is_leader or self.env.user.is_purchasing_manager:
+        if self.env.user.is_leader or self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
             raise UserError("Bisa langsung Confirm")
         elif self.total_percent_margin == self.total_so_percent_margin and self.sale_order_id:
             raise UserError("Bisa langsung Confirm")