Merge branch 'odoo-backup' into dev/wms

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

1 files changed, 89 insertions, 14 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 3534306c..b4c3b1c2 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -138,11 +138,13 @@ class SaleOrder(models.Model):
     applied_voucher_shipping_id = fields.Many2one(comodel_name='voucher', string='Applied Voucher', copy=False)
     amount_voucher_shipping_disc = fields.Float(string='Voucher Discount')
     source_id = fields.Many2one('utm.source', 'Source', domain="[('id', 'in', [32, 59, 60, 61])]", required=True)
-    estimated_arrival_days = fields.Integer('Estimated Arrival Days', default=0)
+    estimated_arrival_days = fields.Integer('Estimated Arrival To', default=0)
+    estimated_arrival_days_start = fields.Integer('Estimated Arrival From', default=0)
     email = fields.Char(string='Email')
     picking_iu_id = fields.Many2one('stock.picking', 'Picking IU')
     helper_by_id = fields.Many2one('res.users', 'Helper By')
-    eta_date = fields.Datetime(string='ETA Date', copy=False, compute='_compute_eta_date')
+    eta_date_start = fields.Datetime(string='ETA Date start', copy=False, compute='_compute_eta_date')
+    eta_date = fields.Datetime(string='ETA Date end', copy=False, compute='_compute_eta_date')
     flash_sale = fields.Boolean(string='Flash Sale', help='Data dari web')
     is_continue_transaction = fields.Boolean(string='Button Transaction', help='Data dari web')
     web_approval = fields.Selection([
@@ -189,7 +191,17 @@ class SaleOrder(models.Model):
         ('PNR', 'Pareto Non Repeating'),
         ('NP', 'Non Pareto')
     ])
+    estimated_ready_ship_date = fields.Datetime(
+        string='ET Ready to Ship compute',
+        compute='_compute_etrts_date'
+    )
+    expected_ready_to_ship = fields.Datetime(
+        string='ET Ready to Ship',
+        copy=False,
+        store=True
+    )
     shipping_method_picking = fields.Char(string='Shipping Method Picking', compute='_compute_shipping_method_picking')
+    
     reason_cancel = fields.Selection([
         ('harga_terlalu_mahal', 'Harga barang terlalu mahal'),
         ('harga_web_tidak_valid', 'Harga web tidak valid'),
@@ -436,19 +448,77 @@ class SaleOrder(models.Model):
 
             rec.compute_fullfillment = True
 
+    @api.depends('date_order', 'estimated_arrival_days', 'state', 'estimated_arrival_days_start')
     def _compute_eta_date(self):
-        max_leadtime = 0
+         for rec in self:
+            if rec.date_order and rec.state not in ['cancel'] and rec.estimated_arrival_days:
+                rec.eta_date = rec.date_order + timedelta(days=rec.estimated_arrival_days)
+                rec.eta_date_start = rec.date_order + timedelta(days=rec.estimated_arrival_days_start)
+            else:
+                rec.eta_date = False
+                rec.eta_date_start = False
+                
+                
+    def get_days_until_next_business_day(self,start_date=None, *args, **kwargs):
+        today = start_date or datetime.today().date()
+        offset = 0  # Counter jumlah hari yang ditambahkan
+        holiday = self.env['hr.public.holiday']
+
+        while True :
+            today += timedelta(days=1)
+            offset += 1
+            
+            if today.weekday() >= 5:
+                continue
 
-        for line in self.order_line:
-            leadtime = line.vendor_id.leadtime
-            max_leadtime = max(max_leadtime, leadtime)
+            is_holiday = holiday.search([("start_date", "=", today)])
+            if is_holiday:
+                continue
+            
+            break
+
+        return offset
 
+    @api.depends("order_line.product_id") 
+    def _compute_etrts_date(self): #Function to calculate Estimated Ready To Ship Date
         for rec in self:
-            if rec.date_order and rec.state not in ['cancel', 'draft']:
-                eta_date = datetime.now() + timedelta(days=max_leadtime)
-                rec.eta_date = eta_date
-            else:
-                rec.eta_date = False
+            max_slatime = 1  # Default SLA jika tidak ada
+            for line in rec.order_line:
+                product_sla = self.env['product.sla'].search([('product_variant_id', '=', line.product_id.id)], limit=1)
+                # if(product_sla == False):
+                #     continue
+                slatime = int(product_sla.sla) if product_sla and product_sla.sla and product_sla.sla != 'Indent' and "hari" in product_sla.sla.lower() else 15
+                max_slatime = max(max_slatime, slatime)
+
+            if rec.date_order:
+                eta_date = rec.date_order + timedelta(days=self.get_days_until_next_business_day(rec.date_order)) + timedelta(days=max_slatime)
+                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
+                    
+    @api.onchange('expected_ready_to_ship') #Hangle Onchange form Expected Ready to Ship
+    def _onchange_expected_ready_ship_date(self):
+        for rec in self:
+            if rec.expected_ready_to_ship and rec.estimated_ready_ship_date:
+                # Hanya membandingkan tanggal saja, tanpa jam
+                expected_date = rec.expected_ready_to_ship.date()
+                estimated_date = rec.estimated_ready_ship_date.date()
+                
+                if expected_date < estimated_date:
+                    rec.expected_ready_to_ship = rec.estimated_ready_ship_date
+                    rec.commitment_date = rec.estimated_ready_ship_date
+                    raise ValidationError(
+                        "Tanggal 'Expected Ready to Ship' tidak boleh lebih kecil dari {}. Mohon pilih tanggal minimal {}."
+                        .format(estimated_date.strftime('%d-%m-%Y'), estimated_date.strftime('%d-%m-%Y'))
+                    )
+
+    def _set_etrts_date(self):
+        for order in self:
+            if order.state in ('done', 'cancel', 'sale'):
+                raise UserError(_("You cannot change the Estimated Ready To Ship Date on a done, sale or cancelled order."))
+            # order.move_lines.write({'estimated_ready_ship_date': order.estimated_ready_ship_date})
 
     def _prepare_invoice(self):
         """
@@ -643,15 +713,16 @@ class SaleOrder(models.Model):
             if line.product_id.type == 'product':
                 line_no += 1
                 line.line_no = line_no
+                
     
     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):
@@ -1109,6 +1180,7 @@ class SaleOrder(models.Model):
             order._set_sppkp_npwp_contact()
             order.calculate_line_no()
             order.send_notif_to_salesperson()
+            order._compute_etrts_date()
             # order.order_line.get_reserved_from()
 
         res = super(SaleOrder, self).action_confirm()
@@ -1504,13 +1576,14 @@ class SaleOrder(models.Model):
     def create(self, vals):
         # Ensure partner details are updated when a sale order is created
         order = super(SaleOrder, self).create(vals)
+        order._compute_etrts_date()
         # order._update_partner_details()
         return order
 
     def write(self, vals):
         # Call the super method to handle the write operation
         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()
@@ -1545,4 +1618,6 @@ class SaleOrder(models.Model):
                             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()
         return res
\ No newline at end of file