Merge branch 'production' into iman/pengajuan-tempo

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

1 files changed, 44 insertions, 22 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 1ad08154..75332996 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -11,6 +11,7 @@ _logger = logging.getLogger(__name__)
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    fulfillment_line_v2 = fields.One2many('sales.order.fulfillment.v2', 'sale_order_id', string='Fullfillment2')
     fullfillment_line = fields.One2many('sales.order.fullfillment', 'sales_order_id', string='Fullfillment')
     reject_line = fields.One2many('sales.order.reject', 'sale_order_id', string='Reject Lines')
     order_sales_match_line = fields.One2many('sales.order.purchase.match', 'sales_order_id', string='Purchase Match Lines', states={'cancel': [('readonly', True)], 'done': [('readonly', True)]}, copy=True)
@@ -78,7 +79,7 @@ class SaleOrder(models.Model):
     payment_link_midtrans = fields.Char(string='Payment Link', help='Url payment yg digenerate oleh midtrans, harap diserahkan ke customer agar dapat dilakukan pembayaran secara mandiri')
     payment_qr_code = fields.Binary("Payment QR Code")
     due_id = fields.Many2one('due.extension', string="Due Extension", readonly=True, tracking=True)   
-    vendor_approval_id = fields.Many2one('vendor.approval', string="Vendor Approval", readonly=True, tracking=True)   
+    vendor_approval_id = fields.Many2one('vendor.approval', string="Vendor Approval", readonly=True, tracking=True, copy=False)   
     customer_type = fields.Selection([
         ('pkp', 'PKP'),
         ('nonpkp', 'Non PKP')
@@ -148,7 +149,7 @@ class SaleOrder(models.Model):
         missing_weight_products = []
 
         for line in self.order_line:
-            if line.weight:
+            if line.weight > 0:
                 total_weight += line.weight * line.product_uom_qty
 
         self.total_weight = total_weight
@@ -161,7 +162,7 @@ class SaleOrder(models.Model):
         missing_weight_products = []
 
         for line in self.order_line:
-            if line.weight:
+            if line.weight > 0:
                 total_weight += line.weight * line.product_uom_qty
                 line.product_id.weight = line.weight    
             else:
@@ -186,7 +187,7 @@ class SaleOrder(models.Model):
         missing_weight_products = []
 
         for line in self.order_line:
-            if line.weight:
+            if line.weight > 0:
                 total_weight += line.weight * line.product_uom_qty
                 line.product_id.weight = line.weight    
             else:
@@ -346,10 +347,10 @@ class SaleOrder(models.Model):
     
     def _compute_fullfillment(self):
         for rec in self:
-            rec.fullfillment_line.unlink()
-
-            for line in rec.order_line:
-                line._compute_reserved_from()
+        #     rec.fullfillment_line.unlink()
+        #
+        #     for line in rec.order_line:
+        #         line._compute_reserved_from()
 
             rec.compute_fullfillment = True
 
@@ -490,8 +491,8 @@ class SaleOrder(models.Model):
             raise UserError('Phone Real Delivery Address harus diisi')
         if not real_delivery_address.kecamatan_id:
             raise UserError('Kecamatan Real Delivery Address harus diisi')
-        if not real_delivery_address.kelurahan_id:
-            raise UserError('Kelurahan Real Delivery Address harus diisi')
+        # if not real_delivery_address.kelurahan_id:
+        #     raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     def generate_payment_link_midtrans_sales_order(self):
         # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox
@@ -625,19 +626,19 @@ class SaleOrder(models.Model):
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
 
-    def check_data_real_delivery_address(self):
-        real_delivery_address = self.real_shipping_id
+    # def check_data_real_delivery_address(self):
+    #     real_delivery_address = self.real_shipping_id
 
-        if not real_delivery_address.state_id:
-            raise UserError('State Real Delivery Address harus diisi')
-        if not real_delivery_address.zip:
-            raise UserError('Zip code Real Delivery Address harus diisi')
-        if not real_delivery_address.mobile:
-            raise UserError('Mobile Real Delivery Address harus diisi')
-        if not real_delivery_address.phone:
-            raise UserError('Phone Real Delivery Address harus diisi')
-        if not real_delivery_address.kecamatan_id:
-            raise UserError('Kecamatan Real Delivery Address harus diisi')
+    #     if not real_delivery_address.state_id:
+    #         raise UserError('State Real Delivery Address harus diisi')
+    #     if not real_delivery_address.zip:
+    #         raise UserError('Zip code Real Delivery Address harus diisi')
+    #     if not real_delivery_address.mobile:
+    #         raise UserError('Mobile Real Delivery Address harus diisi')
+    #     if not real_delivery_address.phone:
+    #         raise UserError('Phone Real Delivery Address harus diisi')
+    #     if not real_delivery_address.kecamatan_id:
+    #         raise UserError('Kecamatan Real Delivery Address harus diisi')
 
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
@@ -768,7 +769,28 @@ class SaleOrder(models.Model):
         self._validate_order()
         for order in self:
             order.order_line.validate_line()
+            order.check_data_real_delivery_address()
+            order._validate_order()
+            order.sale_order_check_approve()
 
+            main_parent = order.partner_id.get_main_parent()
+            SYSTEM_UID = 25
+            FROM_WEBSITE = order.create_uid.id == SYSTEM_UID
+
+            if FROM_WEBSITE and main_parent.use_so_approval and order.web_approval not in ['cust_procurement','cust_director']:
+                raise UserError("This order not yet approved by customer procurement or director")
+
+            if not order.client_order_ref and order.create_date > datetime(2024, 6, 27):
+                raise UserError("Customer Reference kosong, di isi dengan NO PO jika PO tidak ada mohon ditulis Tanpa PO")
+
+            if not order.commitment_date and order.create_date > datetime(2024, 9, 12):
+                raise UserError("Expected Delivery Date kosong, wajib diisi")
+
+            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')
 
             term_days = 0
             for term_line in order.payment_term_id.line_ids: