From 39da2566a2af32b3fdaeae1ce826e4f778e9b8ce Mon Sep 17 00:00:00 2001 From: trisusilo48 Date: Tue, 25 Feb 2025 14:30:39 +0700 Subject: ketinggalan --- indoteknik_custom/models/sale_order.py | 7 ------- indoteknik_custom/models/stock_picking.py | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index d956e93a..43177f33 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -393,13 +393,6 @@ class SaleOrder(models.Model): rec.eta_date = False rec.eta_date_start = False - @api.depends('date_order', 'state', 'estimated_arrival_days_start') - def _compute_eta_start_date(self): - for rec in self: - if rec.date_order and rec.state not in ['cancel'] and rec.estimated_arrival_days_start: - rec.eta_date_start = rec.date_order + timedelta(days=rec.estimated_arrival_days_start) - else: - 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() diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index be395cef..00db6717 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -1097,6 +1097,12 @@ class StockPicking(models.Model): def get_tracking_detail(self): self.ensure_one() + + order = self.env['sale.order'].search([('name', '=', self.sale_id.name)], limit=1) + + eta_start = order.date_order + timedelta(days=order.estimated_arrival_days_start).strftime('%d %b') + eta_end = order.date_order + timedelta(days=order.estimated_arrival_days).strftime('%d %b %Y') + formatted_eta = f"{eta_start} - {eta_end}" response = { 'delivery_order': { @@ -1109,7 +1115,7 @@ class StockPicking(models.Model): 'status': self.shipping_status, 'waybill_number': self.delivery_tracking_no or '', 'delivery_status': None, - 'eta': self.generate_eta_delivery(), + 'eta': formatted_eta, 'is_biteship': True if self.biteship_id else False, 'manifests': self.get_manifests() } -- cgit v1.2.3