uat bitehsip

1 files changed, 15 insertions, 19 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 852e3cf0..b22ee2ee 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -498,7 +498,6 @@ class SaleOrder(models.Model):
         if all_fast_products:
             return {'slatime': 1, 'include_instant': include_instant}
 
-
         # Cari semua vendor pemenang untuk produk yang diberikan
         vendors = self.env['purchase.pricelist'].search([
             ('product_id', 'in', product_ids),
@@ -532,18 +531,18 @@ class SaleOrder(models.Model):
             max_slatime = 1  # Default SLA jika tidak ada
             slatime = self.calculate_sla_by_vendor(rec.order_line)
             max_slatime = max(max_slatime, slatime['slatime'])
+            
+            
+            current_date = datetime.now().date()
 
             if rec.date_order:
-                sum_days = max_slatime + self.get_days_until_next_business_day(rec.date_order) - 1
-                if not rec.estimated_arrival_days:
-                    rec.estimated_arrival_days = sum_days
-                    
-                eta_date = rec.date_order + timedelta(days=sum_days)
+                sum_days = max_slatime + self.get_days_until_next_business_day(current_date) - 1
+                rec.estimated_arrival_days = sum_days
+                
+                eta_date = current_date + timedelta(days=sum_days)
                 rec.estimated_ready_ship_date = eta_date
                 rec.commitment_date = eta_date
-                # Jika expected_ready_to_ship kosong, set nilai default
-                if not rec.expected_ready_to_ship:
-                    rec.expected_ready_to_ship = eta_date
+                rec.expected_ready_to_ship = eta_date
                     
               
                     
@@ -765,14 +764,10 @@ class SaleOrder(models.Model):
                 
     
     def write(self, vals):
-        res = super(SaleOrder, self).write(vals)
-        # self._compute_etrts_date()
         if 'carrier_id' in vals:
             for picking in self.picking_ids:
                 if picking.state == 'assigned':
                     picking.carrier_id = self.carrier_id
-                    
-        return res
 
     def calculate_so_status(self):
         so_state = ['sale']
@@ -1229,7 +1224,7 @@ class SaleOrder(models.Model):
             order._set_sppkp_npwp_contact()
             order.calculate_line_no()
             order.send_notif_to_salesperson()
-            order._compute_etrts_date()
+            # order._compute_etrts_date()
             # order.order_line.get_reserved_from()
 
         res = super(SaleOrder, self).action_confirm()
@@ -1629,15 +1624,15 @@ class SaleOrder(models.Model):
         # order._update_partner_details()
         return order
 
-    def write(self, vals):
+    # def write(self, vals):
         # Call the super method to handle the write operation
-        res = super(SaleOrder, self).write(vals)
+        # res = super(SaleOrder, self).write(vals)
         # self._compute_etrts_date()
         # Check if the update is coming from a save operation
         # if any(field in vals for field in ['sppkp', 'npwp', 'email', 'customer_type']):
         #     self._update_partner_details()
 
-        return res
+        # return res
 
     def _update_partner_details(self):
         for order in self:
@@ -1666,7 +1661,8 @@ class SaleOrder(models.Model):
                         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)
-        if 'order_line' in vals:
-            self._compute_etrts_date()
+        if any(field in vals for field in ["order_line", "client_order_ref"]):
+            self._compute_etrts_date() 
         return res
\ No newline at end of file