<miqdad> merge

1 files changed, 229 insertions, 99 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 1827c489..f3d7c2b9 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -20,8 +20,10 @@ _logger = logging.getLogger(__name__)
 
 _biteship_url = "https://api.biteship.com/v1"
 biteship_api_key = "biteship_live.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiaW5kb3Rla25payIsInVzZXJJZCI6IjY3MTViYTJkYzVkMjdkMDAxMjRjODk2MiIsImlhdCI6MTc0MTE1NTU4M30.pbFCai9QJv8iWhgdosf8ScVmEeP3e5blrn33CHe7Hgo"
+
+
 # biteship_api_key = "biteship_test.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiSW5kb3Rla25payIsInVzZXJJZCI6IjY3MTViYTJkYzVkMjdkMDAxMjRjODk2MiIsImlhdCI6MTcyOTQ5ODAwMX0.L6C73couP4-cgVEfhKI2g7eMCMo3YOFSRZhS-KSuHNA"
-        
+
 
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
@@ -123,7 +125,7 @@ class StockPicking(models.Model):
     waybill_id = fields.One2many(comodel_name='airway.bill', inverse_name='do_id', string='Airway Bill')
     purchase_representative_id = fields.Many2one('res.users', related='move_lines.purchase_line_id.order_id.user_id',
                                                  string="Purchase Representative")
-    carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method')
+    carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method', tracking=3)
     shipping_status = fields.Char(string='Shipping Status', compute="_compute_shipping_status")
     date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya', copy=False)
     status_printed = fields.Selection([
@@ -275,16 +277,29 @@ class StockPicking(models.Model):
 
     # Biteship Section
     biteship_id = fields.Char(string="Biteship Respon ID")
-    biteship_tracking_id = fields.Char(string="Biteship Trackcking ID")
+    biteship_tracking_id = fields.Char(string="Biteship Tracking ID")
     biteship_waybill_id = fields.Char(string="Biteship Waybill ID")
+    biteship_driver_name = fields.Char('Biteship Driver Name')
+    biteship_driver_phone = fields.Char('Biteship Driver Phone')
+    biteship_driver_plate_number = fields.Char('Biteship Driver Plate Number')
+    biteship_courier_link = fields.Char('Biteship Courier Link')
+    biteship_shipping_status = fields.Char('Biteship Shipping Status', help="Status pengiriman dari Biteship")
+    biteship_shipping_price = fields.Monetary('Biteship Shipping Price', currency_field='currency_id',
+                                              help="Harga pengiriman dari Biteship")
+    currency_id = fields.Many2one('res.currency', related='sale_id.currency_id', string='Currency', readonly=True)
     final_seq = fields.Float(string='Remaining Time')
-    shipping_method_so_id = fields.Many2one('delivery.carrier', string='Shipping Method SO', related='sale_id.carrier_id')
-    shipping_option_so_id = fields.Many2one('shipping.option', string='Shipping Option SO', related='sale_id.shipping_option_id')
+    shipping_method_so_id = fields.Many2one('delivery.carrier', string='Shipping Method', related='sale_id.carrier_id',
+                                            help="Shipping Method yang digunakan di SO", tracking=3)
+    shipping_option_so_id = fields.Many2one('shipping.option', string='Shipping Option',
+                                            related='sale_id.shipping_option_id',
+                                            help="Shipping Option yang digunakan di SO", tracking=3)
     select_shipping_option_so = fields.Selection([
         ('biteship', 'Biteship'),
         ('custom', 'Custom'),
-    ], string='Shipping Type SO', related='sale_id.select_shipping_option')
-    state_packing = fields.Selection([('not_packing', 'Belum Packing'), ('packing_done', 'Sudah Packing')], string='Packing Status')
+    ], string='Shipping Type', related='sale_id.select_shipping_option', help="Shipping Type yang digunakan di SO",
+        tracking=3)
+    state_packing = fields.Selection([('not_packing', 'Belum Packing'), ('packing_done', 'Sudah Packing')],
+                                     string='Packing Status')
     approval_invoice_date_id = fields.Many2one('approval.invoice.date', string='Approval Invoice Date')
     last_update_date_doc_kirim = fields.Datetime(string='Last Update Tanggal Kirim', copy=False)
     update_date_doc_kirim_add = fields.Boolean(string='Update Tanggal Kirim Lewat ADD')
@@ -295,7 +310,7 @@ class StockPicking(models.Model):
         if not self.name or not self.origin:
             return False
         return f"{self.name}"
-    
+
     def _download_pod_photo(self, url):
         """Mengunduh foto POD dari URL"""
         try:
@@ -304,7 +319,7 @@ class StockPicking(models.Model):
             return base64.b64encode(response.content)
         except Exception as e:
             raise UserError(f"Gagal mengunduh foto POD: {str(e)}")
-    
+
     def _parse_datetime(self, dt_str):
         """Parse datetime string dari format KGX"""
         try:
@@ -315,37 +330,37 @@ class StockPicking(models.Model):
             return datetime.strptime(dt_str, '%Y-%m-%dT%H:%M:%S')
         except ValueError:
             return False
-    
+
     def action_get_kgx_pod(self, shipment=False):
         self.ensure_one()
-        
+
         awb_number = shipment or self._get_kgx_awb_number()
         if not awb_number:
             raise UserError("Nomor AWB tidak dapat dibuat, pastikan picking memiliki name dan origin")
-            
+
         url = "https://kgx.co.id/get_detail_awb"
         headers = {'Content-Type': 'application/json'}
-        payload = {"params" : {'awb_number': awb_number}}
-        
+        payload = {"params": {'awb_number': awb_number}}
+
         try:
             response = requests.post(url, headers=headers, data=json.dumps(payload))
             response.raise_for_status()
             data = response.json()
-            
+
             if data.get('result', {}).get('data', []):
                 pod_data = data['result']['data'][0].get('connote_pod', {})
                 photo_url = pod_data.get('photo')
-                
+
                 self.kgx_pod_photo_url = photo_url
                 self.kgx_pod_signature = pod_data.get('signature')
                 self.kgx_pod_receiver = pod_data.get('receiver')
                 self.kgx_pod_receive_time = self._parse_datetime(pod_data.get('timeReceive'))
                 self.driver_arrival_date = self._parse_datetime(pod_data.get('timeReceive'))
-                
+
                 return data
             else:
                 raise UserError(f"Tidak ditemukan data untuk AWB: {awb_number}")
-                
+
         except requests.exceptions.RequestException as e:
             raise UserError(f"Gagal mengambil data POD: {str(e)}")
 
@@ -692,8 +707,9 @@ class StockPicking(models.Model):
             raise UserError(f"Order ini sudah dikirim ke Biteship. Dengan Tracking Id: {self.biteship_tracking_id}")
 
         if self.sale_id.select_shipping_option == 'custom':
-            raise UserError("Shipping Option pada Sales Order ini adalah *Custom*. Tidak dapat dikirim melalui Biteship.")
-        
+            raise UserError(
+                "Shipping Option pada Sales Order ini adalah *Custom*. Tidak dapat dikirim melalui Biteship.")
+
         def is_courier_need_coordinates(service_code):
             return service_code in [
                 "instant", "same_day", "instant_car",
@@ -790,11 +806,11 @@ class StockPicking(models.Model):
 
             self.message_post(
                 body=f"Biteship berhasil dilakukan.<br/>"
-                    f"Kurir: {self.carrier_id.name}<br/>"
-                    f"Tracking ID: {self.biteship_tracking_id or '-'}<br/>"
-                    f"Resi: {waybill_id or '-'}<br/>"
-                    f"Reference: {self.name}<br/>"
-                    f"SO: {self.sale_id.name}",
+                     f"Kurir: {self.carrier_id.name}<br/>"
+                     f"Tracking ID: {self.biteship_tracking_id or '-'}<br/>"
+                     f"Resi: {waybill_id or '-'}<br/>"
+                     f"Reference: {self.name}<br/>"
+                     f"SO: {self.sale_id.name}",
                 message_type="comment"
             )
 
@@ -936,6 +952,9 @@ class StockPicking(models.Model):
             pending_section = None
             # Invoice values.
             invoice_vals = order._prepare_invoice()
+            invoice_date = self.date_done
+            invoice_vals['date'] = invoice_date
+            invoice_vals['invoice_date'] = invoice_date
             # Invoice line values (keep only necessary sections).
             for line in self.move_ids_without_package:
                 po_line = self.env['purchase.order.line'].search(
@@ -1307,7 +1326,6 @@ class StockPicking(models.Model):
                         )
                     )
 
-
         self.validation_minus_onhand_quantity()
         self.responsible = self.env.user.id
         # self.send_koli_to_so()
@@ -1358,7 +1376,7 @@ class StockPicking(models.Model):
         if 'BU/PUT' in self.name:
             self.automatic_reserve_product()
         return res
-    
+
     def automatic_reserve_product(self):
         if self.state == 'done':
             po = self.env['purchase.order'].search([
@@ -1376,11 +1394,12 @@ class StockPicking(models.Model):
                 continue
 
             invoice = self.env['account.move'].search(
-                [('sale_id', '=', picking.sale_id.id), ('state', 'not in', ['draft', 'cancel']), ('move_type', '=', 'out_invoice')], limit=1)
+                [('sale_id', '=', picking.sale_id.id), ('state', 'not in', ['draft', 'cancel']),
+                 ('move_type', '=', 'out_invoice')], limit=1)
 
             if not invoice:
                 continue
-                
+
             if not picking.so_lama and invoice and (not picking.date_doc_kirim or not invoice.invoice_date):
                 raise UserError("Tanggal Kirim atau Tanggal Invoice belum diisi!")
 
@@ -1664,7 +1683,7 @@ class StockPicking(models.Model):
         self.ensure_one()
 
         order = self.env['sale.order'].search([('name', '=', self.sale_id.name)], limit=1)
-        
+
         sale_order_delay = self.env['sale.order.delay'].search([('so_number', '=', order.name)], limit=1)
 
         product_shipped = []
@@ -1679,11 +1698,12 @@ class StockPicking(models.Model):
             'delivery_order': {
                 'name': self.name,
                 'carrier': self.carrier_id.name or '-',
-                'service' : order.delivery_service_type or '-',
+                'service': order.delivery_service_type or '-',
                 'receiver_name': '',
                 'receiver_city': ''
             },
-            'delivered_date':  self.driver_departure_date.strftime('%d %b %Y') if self.driver_departure_date != False else '-',
+            'delivered_date': self.driver_departure_date.strftime(
+                '%d %b %Y') if self.driver_departure_date != False else '-',
             'delivered': False,
             'status': self.shipping_status,
             'waybill_number': self.delivery_tracking_no or '-',
@@ -1706,7 +1726,7 @@ class StockPicking(models.Model):
                 elif sale_order_delay.status == 'early':
                     day_start = day_start - sale_order_delay.days_delayed
                     day_end = day_end - sale_order_delay.days_delayed
-            
+
             eta_start = order.date_order + timedelta(days=day_start)
             eta_end = order.date_order + timedelta(days=day_end)
             formatted_eta = f"{eta_start.strftime('%d %b')} - {eta_end.strftime('%d %b %Y')}"
@@ -1735,7 +1755,7 @@ class StockPicking(models.Model):
             "Authorization": f"Bearer {api_key}",
             "Content-Type": "application/json"
         }
-        
+
         manifests = []
 
         try:
@@ -1743,15 +1763,15 @@ class StockPicking(models.Model):
             response = requests.get(_biteship_url + '/trackings/' + self.biteship_tracking_id, headers=headers,
                                     json=manifests)
             result = response.json()
-            description = {
-                'confirmed' : 'Indoteknik telah melakukan permintaan pick-up',
-                'allocated' : 'Kurir akan melakukan pick-up pesanan',
-                'picking_up' : 'Kurir sedang dalam perjalanan menuju lokasi pick-up',
-                'picked' : 'Pesanan sudah di pick-up kurir '+result.get("courier", {}).get("company", ""),
-                'on_hold' : 'Pesanan ditahan sementara karena masalah pengiriman',
-                'dropping_off' : 'Kurir sudah ditugaskan dan pesanan     akan segera diantar ke pembeli',
-                'delivered' : f'Pesanan telah sampai dan diterima oleh <span style="color:#DC2626;">{result.get("destination", {}).get("contact_name", "")}</span>'
-            }
+            # description = {
+            #     'confirmed' : 'Indoteknik telah melakukan permintaan pick-up',
+            #     'allocated' : 'Kurir akan melakukan pick-up pesanan',
+            #     'picking_up' : 'Kurir sedang dalam perjalanan menuju lokasi pick-up',
+            #     'picked' : 'Pesanan sudah di pick-up kurir '+result.get("courier", {}).get("company", ""),
+            #     'on_hold' : 'Pesanan ditahan sementara karena masalah pengiriman',
+            #     'dropping_off' : 'Kurir sudah ditugaskan dan pesanan     akan segera diantar ke pembeli',
+            #     'delivered' : f'Pesanan telah sampai dan diterima oleh <span style="color:#DC2626;">{result.get("destination", {}).get("contact_name", "")}</span>'
+            # }
             if (result.get('success') == True):
                 history = result.get("history", [])
                 status = result.get("status", "")
@@ -1760,7 +1780,7 @@ class StockPicking(models.Model):
                     manifests.append({
                         "status": re.sub(r'[^a-zA-Z0-9\s]', ' ', entry["status"]).lower().capitalize(),
                         "datetime": self._convert_to_local_time(entry["updated_at"]),
-                        "description": description[entry["status"]],
+                        "description": self._get_biteship_status_description(entry["status"], result),
                     })
 
                 return {
@@ -1772,57 +1792,163 @@ class StockPicking(models.Model):
                 "manifests": [],
                 "delivered": False
             }
-        except Exception as e :
+        except Exception as e:
             _logger.error(f"Error fetching Biteship order for picking {self.id}: {str(e)}")
-            return { 'error': str(e) }
-
-    def action_sync_biteship_tracking(self):
-        for picking in self:
-            if not picking.biteship_id:
-                raise UserError("Tracking Biteship tidak tersedia.")
-
-            histori = picking.get_manifest_biteship()
-            updated_fields = {}
-            seen_logs = set()
-
-            manifests = sorted(histori.get("manifests", []), key=lambda m: m.get("datetime") or "")
-
-            for manifest in manifests:
-                status = manifest.get("status", "").lower()
-                dt_str = manifest.get("datetime")
-                desc = manifest.get("description")
-                dt = False
-
-                try:
-                    dt = picking._convert_to_utc_datetime(dt_str)
-                    _logger.info(f"[Biteship Sync] Berhasil parse datetime: {dt_str} -> {dt}")
-                except Exception as e:
-                    _logger.warning(f"[Biteship Sync] Gagal parse datetime: {e}")
-                    continue
+            return {'error': str(e)}
+
+    # ACTION GET TRACKING MANUAL BITESHIP
+    # def action_sync_biteship_tracking(self):
+    #     for picking in self:
+    #         if not picking.biteship_id:
+    #             raise UserError("Tracking Biteship tidak tersedia.")
+
+    #         histori = picking.get_manifest_biteship()
+    #         updated_fields = {}
+    #         seen_logs = set()
+
+    #         manifests = sorted(histori.get("manifests", []), key=lambda m: m.get("datetime") or "")
+
+    #         for manifest in manifests:
+    #             status = manifest.get("status", "").lower()
+    #             dt_str = manifest.get("datetime")
+    #             desc = manifest.get("description")
+    #             dt = False
+
+    #             try:
+    #                 dt = picking._convert_to_utc_datetime(dt_str)
+    #                 _logger.info(f"[Biteship Sync] Berhasil parse datetime: {dt_str} -> {dt}")
+    #             except Exception as e:
+    #                 _logger.warning(f"[Biteship Sync] Gagal parse datetime: {e}")
+    #                 continue
+
+    #             # Update tanggal ke field (pastikan naive datetime UTC)
+    #             if status == "picked" and dt and not picking.driver_departure_date:
+    #                 updated_fields["driver_departure_date"] = fields.Datetime.to_string(dt)
+
+    #             if status == "delivered" and dt and not picking.driver_arrival_date:
+    #                 updated_fields["driver_arrival_date"] = fields.Datetime.to_string(dt)
+
+    #             # Buat log unik dengan waktu lokal Asia/Jakarta
+    #             if dt and desc:
+    #                 try:
+    #                     dt_local = parser.parse(dt_str).replace(tzinfo=None)
+    #                 except Exception as e:
+    #                     _logger.warning(f"[Biteship Sync] Gagal parse dt_str untuk log: {e}")
+    #                     dt_local = dt  # fallback
+
+    #                 desc_clean = ' '.join(desc.strip().split())
+    #                 log_line = f"[TRACKING] {status} - {dt_local.strftime('%d %b %Y %H:%M')}: {desc_clean}"
+    #                 if not picking._has_existing_log(log_line):
+    #                     picking.message_post(body=log_line)
+    #                     seen_logs.add(log_line)
+
+    #         if updated_fields:
+    #             picking.write(updated_fields)
+
+    def action_open_biteship_tracking(self):
+        self.ensure_one()
+        if not self.biteship_courier_link:
+            raise UserError("Biteship tracking link tidak tersedia.")
+        return {
+            'type': 'ir.actions.act_url',
+            'url': self.biteship_courier_link,
+            'target': 'new',
+        }
 
-                # Update tanggal ke field (pastikan naive datetime UTC)
-                if status == "picked" and dt and not picking.driver_departure_date:
-                    updated_fields["driver_departure_date"] = fields.Datetime.to_string(dt)
+    def _get_biteship_status_description(self, status, data=None):
+        data = data or {}
+        courier = data.get("courier", {}).get("company", "")
+        contact_name = data.get("destination", {}).get("contact_name", "")
+
+        description_map = {
+            'confirmed': 'Indoteknik telah melakukan permintaan pick-up',
+            'allocated': 'Kurir akan melakukan pick-up pesanan',
+            'picking_up': 'Kurir sedang dalam perjalanan menuju lokasi pick-up',
+            'picked': f'Pesanan sudah di pick-up kurir {courier}',
+            'dropping_off': 'Kurir sudah ditugaskan dan pesanan akan segera diantar ke pembeli',
+            'delivered': f'Pesanan telah sampai dan diterima oleh <span style="color:#DC2626;">{contact_name}</span>',
+            'return_in_transit': 'Pesanan dalam perjalanan kembali ke pengirim',
+            'on_hold': 'Pesanan ditahan sementara karena masalah pengiriman',
+            'rejected': 'Pesanan ditolak, silakan hubungi Biteship',
+            'courier_not_found': 'Pesanan dibatalkan karena tidak ada kurir tersedia',
+            'returned': 'Pesanan berhasil dikembalikan',
+            'disposed': 'Pesanan sudah dimusnahkan',
+            'cancelled': 'Pesanan dibatalkan oleh sistem atau pengguna',
+        }
 
-                if status == "delivered" and dt and not picking.driver_arrival_date:
-                    updated_fields["driver_arrival_date"] = fields.Datetime.to_string(dt)
+        return description_map.get(status, f"Status '{status}' diterima dari Biteship")
 
-                # Buat log unik dengan waktu lokal Asia/Jakarta
-                if dt and desc:
-                    try:
-                        dt_local = parser.parse(dt_str).replace(tzinfo=None)
-                    except Exception as e:
-                        _logger.warning(f"[Biteship Sync] Gagal parse dt_str untuk log: {e}")
-                        dt_local = dt  # fallback
+    def log_biteship_event_from_webhook(self, status, timestamp, description, extra_data=None):
+        self.ensure_one()
+        updated_fields = {}
 
-                    desc_clean = ' '.join(desc.strip().split())
-                    log_line = f"[TRACKING] {status} - {dt_local.strftime('%d %b %Y %H:%M')}: {desc_clean}"
-                    if not picking._has_existing_log(log_line):
-                        picking.message_post(body=log_line)
-                        seen_logs.add(log_line)
+        try:
+            dt = self._convert_to_utc_datetime(timestamp)
+        except Exception as e:
+            _logger.warning(f"[Webhook] Gagal konversi waktu: {e}")
+            dt = datetime.utcnow()
+
+        # Penanganan status pengiriman
+        if status == "picked" and not self.driver_departure_date:
+            updated_fields["driver_departure_date"] = fields.Datetime.to_string(dt)
+        if status == "delivered" and not self.driver_arrival_date:
+            updated_fields["driver_arrival_date"] = fields.Datetime.to_string(dt)
+
+        shipping_status = self._map_status_biteship(status)
+        if shipping_status and self.shipping_status != shipping_status:
+            updated_fields["shipping_status"] = shipping_status
+
+        # Penanganan extra data dari webhook
+        if extra_data:
+            # Informasi kurir
+            if extra_data.get("courier_driver_name"):
+                updated_fields["biteship_driver_name"] = extra_data["courier_driver_name"]
+            if extra_data.get("courier_driver_phone"):
+                updated_fields["biteship_driver_phone"] = extra_data["courier_driver_phone"]
+            if extra_data.get("courier_driver_plate_number"):
+                updated_fields["biteship_driver_plate_number"] = extra_data["courier_driver_plate_number"]
+            if extra_data.get("courier_link"):
+                updated_fields["biteship_courier_link"] = extra_data["courier_link"]
+            # Informasi harga
+            if extra_data.get("order_price"):
+                updated_fields["biteship_shipping_price"] = extra_data["order_price"]
+            # Status mentah dari Biteship
+            if extra_data.get("status"):
+                updated_fields["biteship_shipping_status"] = extra_data["status"]
+
+            # Tambahan untuk handle order.waybill_id
+            if extra_data.get("tracking_id"):
+                updated_fields["biteship_tracking_id"] = extra_data["tracking_id"]
+                updated_fields["delivery_tracking_no"] = extra_data["tracking_id"]
+            if extra_data.get("waybill_id"):
+                updated_fields["biteship_waybill_id"] = extra_data["waybill_id"]
+
+        # Konversi waktu lokal untuk log
+        try:
+            dt_parsed = parser.parse(timestamp)
+            if dt_parsed.tzinfo is None:
+                dt_parsed = dt_parsed.replace(tzinfo=pytz.utc)
+            dt_local = dt_parsed.astimezone(pytz.timezone("Asia/Jakarta"))
+        except Exception:
+            dt_local = dt.astimezone(pytz.timezone("Asia/Jakarta"))
+
+        # Format pesan log
+        desc_clean = ' '.join(description.strip().split())
+        log_line = f"[TRACKING] {status} - {dt_local.strftime('%d %b %Y %H:%M')}:<br/>{desc_clean}"
+
+        # Hindari log duplikat
+        if not self._has_existing_log(log_line):
+            biteship_user = self.env['res.users'].sudo().browse(15710)  # ID live
+            # biteship_user = self.env['res.users'].sudo().browse(15710) # ID user (cek di db)
+            self.sudo().message_post(
+                body=log_line,
+                author_id=biteship_user.partner_id.id
+            )
 
-            if updated_fields:
-                picking.write(updated_fields)
+        # Update field-field terkait
+        if updated_fields:
+            self.write(updated_fields)
+            _logger.info(f"[Webhook] Updated fields on picking {self.name}: {updated_fields}")
 
     def _has_existing_log(self, log_line):
         self.ensure_one()
@@ -1872,10 +1998,15 @@ class StockPicking(models.Model):
             "allocated": "pending",
             "picking_up": "pending",
             "picked": "shipment",
-            "cancelled": "cancelled",
-            "on_hold": "on_hold",
             "dropping_off": "shipment",
-            "delivered": "completed"
+            "delivered": "completed",
+            "return_in_transit": "returning",
+            "on_hold": "on_hold",
+            "rejected": "cancelled",
+            "courier_not_found": "cancelled",
+            "returned": "returned",
+            "disposed": "disposed",
+            "cancelled": "cancelled"
         }
         return status_mapping.get(status, "Hubungi Admin")
 
@@ -1885,8 +2016,7 @@ class StockPicking(models.Model):
         days_end = self.sale_id.estimated_arrival_days or (self.sale_id.estimated_arrival_days + 3)
         start_date = self.sale_id.create_date + datetime.timedelta(days=days_start)
         end_date = self.sale_id.create_date + datetime.timedelta(days=days_end)
-        
-        
+
         add_day_start = 0
         add_day_end = 0
         sale_order_delay = self.env['sale.order.delay'].search([('so_number', '=', self.sale_id.name)], limit=1)
@@ -1895,11 +2025,11 @@ class StockPicking(models.Model):
                 add_day_start = sale_order_delay.days_delayed
                 add_day_end = sale_order_delay.days_delayed
             elif sale_order_delay.status == 'early':
-                add_day_start =   -abs(sale_order_delay.days_delayed)
-                add_day_end =  -abs(sale_order_delay.days_delayed)
-                
-        fastest_eta = start_date +datetime.timedelta(days=add_day_start + add_day_start)
-        
+                add_day_start = -abs(sale_order_delay.days_delayed)
+                add_day_end = -abs(sale_order_delay.days_delayed)
+
+        fastest_eta = start_date + datetime.timedelta(days=add_day_start + add_day_start)
+
         longest_eta = end_date + datetime.timedelta(days=add_day_end)
 
         format_time = '%d %b %Y'