shipment group

1 files changed, 24 insertions, 23 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 99aa8053..8aff6b3a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1264,9 +1264,10 @@ class SaleOrder(models.Model):
             if not order.real_shipping_id:
                 UserError('Real Delivery Address harus di isi')
 
-            if order.validate_partner_invoice_due():
-                return self._create_notification_action('Notification',
-                                                        'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
+            if self.env.context.get('due_approve', []) == False:
+                if order.validate_partner_invoice_due():
+                    return self._create_notification_action('Notification',
+                                                            'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
 
             term_days = 0
             for term_line in order.payment_term_id.line_ids:
@@ -1289,9 +1290,9 @@ class SaleOrder(models.Model):
             if not order.user_id.active:
                 raise UserError("Salesperson sudah tidak aktif, mohon diisi yang benar pada data SO dan Contact")
 
-            if order.validate_partner_invoice_due():
-                return self._create_notification_action('Notification',
-                                                        'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
+            # if order.validate_partner_invoice_due():
+            #     return self._create_notification_action('Notification',
+            #                                             'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
 
             if order._requires_approval_margin_leader():
                 order.approval_status = 'pengajuan2'
@@ -1511,10 +1512,11 @@ class SaleOrder(models.Model):
 
             if not order.real_shipping_id:
                 UserError('Real Delivery Address harus di isi')
-
-            if order.validate_partner_invoice_due():
-                return self._create_notification_action('Notification',
-                                                        'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
+                
+            if self.env.context.get('due_approve', []) == False:
+                if order.validate_partner_invoice_due():
+                    return self._create_notification_action('Notification',
+                                                            'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
 
             if order._requires_approval_margin_leader():
                 order.approval_status = 'pengajuan2'
@@ -1605,19 +1607,18 @@ class SaleOrder(models.Model):
         invoices = self.env['account.move'].search(query, order='invoice_date')
 
         if invoices:
-            if not self.env.user.is_leader and not self.env.user.is_sales_manager:
-                due_extension = self.env['due.extension'].create([{
-                    'partner_id': parent_id,
-                    'day_extension': '3',
-                    'order_id': self.id,
-                }])
-                due_extension.generate_due_line()
-                self.due_id = due_extension.id
-                if len(self.due_id.due_line) > 0:
-                    return True
-                else:
-                    due_extension.unlink()
-                    return False
+            due_extension = self.env['due.extension'].create([{
+                'partner_id': parent_id,
+                'day_extension': '3',
+                'order_id': self.id,
+            }])
+            due_extension.generate_due_line()
+            self.due_id = due_extension.id
+            if len(self.due_id.due_line) > 0:
+                return True
+            else:
+                due_extension.unlink()
+                return False
 
     def _requires_approval_margin_leader(self):
         return self.total_percent_margin <= 15 and not self.env.user.is_leader