Merge branch 'odoo-production' into iman/pengajuan-tempo

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 16 insertions, 3 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 2b448874..2ef1f43d 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1031,8 +1031,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 +1411,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