cr credit limit validation

2 files changed, 5 insertions, 3 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index f24a4bf3..265ffb9e 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -702,7 +702,7 @@ class SaleOrder(models.Model):
             partner = order.partner_id.parent_id or order.partner_id
             if not partner.property_payment_term_id:
                 raise UserError("Payment Term pada Master Data Customer harus diisi")
-            if not partner.active_limit:
+            if not partner.active_limit and order.payment_term_id.id not in [27, 26]:
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
             if order.payment_term_id != partner.property_payment_term_id:
                 raise UserError("Payment Term berbeda pada Master Data Customer")
@@ -727,7 +727,7 @@ class SaleOrder(models.Model):
             partner = order.partner_id.parent_id or order.partner_id
             if not partner.property_payment_term_id:
                 raise UserError("Payment Term pada Master Data Customer harus diisi")
-            if not partner.active_limit:
+            if not partner.active_limit and order.payment_term_id.id not in [27, 26]:
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
             if order.payment_term_id != partner.property_payment_term_id:
                 raise UserError("Payment Term berbeda pada Master Data Customer")
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 6f038386..14190474 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -125,7 +125,9 @@ class StockPicking(models.Model):
                 raise UserError('Hanya Logistic yang bisa mengubah shipping method')
 
     def do_unreserve(self):
-        if not self._context.get('darimana') == 'sale.order':
+        group_id = self.env.ref('indoteknik_custom.group_role_it').id
+        users_in_group = self.env['res.users'].search([('groups_id', 'in', [group_id])])
+        if not self._context.get('darimana') == 'sale.order' and self.env.user.id not in users_in_group.mapped('id'):
             self.sale_id.unreserve_id = self.id
             return self._create_approval_notification('Logistic')