Merge branch 'odoo-production' into CR/form-merchant

# Conflicts:
#	indoteknik_api/models/res_partner.py
#	indoteknik_api/models/res_users.py
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/res_partner.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/res_partner.xml
#	indoteknik_custom/views/user_company_request.xml

1 files changed, 17 insertions, 3 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index f5e7e8a1..48195b77 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -816,6 +816,7 @@ class SaleOrder(models.Model):
                 order.approval_status = 'pengajuan2'
                 return self._create_approval_notification('Pimpinan')
             elif order._requires_approval_margin_manager():
+                self.check_credit_limit()
                 order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Sales Manager')
             
@@ -1031,8 +1032,9 @@ class SaleOrder(models.Model):
         
         if self.have_outstanding_invoice:
             raise UserError("Invoice harus di Cancel dahulu")
-        elif self.have_outstanding_picking:
-            raise UserError("DO harus di Cancel dahulu")
+        for line in self.order_line:
+            if line.qty_delivered > 0:
+                raise UserError("DO harus di-cancel terlebih dahulu.")
         
         if not self.web_approval:
             self.web_approval = 'company'
@@ -1410,4 +1412,16 @@ class SaleOrder(models.Model):
                     'npwp': partner.npwp,
                     'email': partner.email,
                     'customer_type': partner.customer_type,
-                })
\ No newline at end of file
+                })
+
+    def write(self, vals):
+        for order in self:
+            if order.state in ['sale', 'cancel']:
+                if 'order_line' in vals:
+                    new_lines = vals.get('order_line', [])
+                    for command in new_lines:
+                        if command[0] == 0:  # A new line is being added
+                            raise UserError(
+                                "SO tidak dapat ditambahkan produk baru karena SO sudah menjadi sale order.")
+        res = super(SaleOrder, self).write(vals)
+        return res
\ No newline at end of file