Merge branch 'odoo-production' into feature/integrasi_biteship

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 3 insertions, 3 deletions

diff --git a/indoteknik_custom/models/requisition.py b/indoteknik_custom/models/requisition.py
index 32a9f94f..c972b485 100644
--- a/indoteknik_custom/models/requisition.py
+++ b/indoteknik_custom/models/requisition.py
@@ -82,11 +82,11 @@ class Requisition(models.Model):
         state = ['done', 'sale']
         if self.sale_order_id.state in state:
             raise UserError('SO sudah Confirm, akan berakibat double Purchase melalui PJ')
-        if self.env.user.id not in [377, 19]:
+        if self.env.user.id not in [377, 19, 28]:
             raise UserError('Hanya Vita dan Darren Yang Bisa Approve')
-        if self.env.user.id == 377:
+        if self.env.user.id == 377 or self.env.user.id == 28:
             self.sales_approve = True
-        elif self.env.user.id == 19:
+        elif self.env.user.id == 19 or self.env.user.id == 28:
             if not self.sales_approve:
                 raise UserError('Vita Belum Approve')
             self.merchandise_approve = True