fixing revisi renca

1 files changed, 6 insertions, 13 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index f2b69b55..aa616e62 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1442,8 +1442,10 @@ class StockPicking(models.Model):
     
     def generate_eta_delivery(self):
         current_date = datetime.datetime.now()
-        prepare_days = 3
-        start_date = self.driver_departure_date or self.create_date
+        days_start = self.sale_id.estimated_arrival_days_start or self.sale_id.estimated_arrival_days
+        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
@@ -1456,19 +1458,10 @@ class StockPicking(models.Model):
             elif sale_order_delay.status == 'early':
                 add_day_start =   -abs(sale_order_delay.days_delayed)
                 add_day_end =  -abs(sale_order_delay.days_delayed)
-
-        ead = self.sale_id.estimated_arrival_days or 0
-        if not self.driver_departure_date:
-            ead += prepare_days
-
-        ead_datetime = datetime.timedelta(days=ead)
-        fastest_eta = start_date + ead_datetime + datetime.timedelta(days=add_day_start)
                 
-        if not self.driver_departure_date and fastest_eta < current_date:
-            fastest_eta = current_date + ead_datetime
+        fastest_eta = start_date +datetime.timedelta(days=add_day_start + add_day_start)
         
-        longest_days = 3
-        longest_eta = fastest_eta + datetime.timedelta(days=longest_days + add_day_end)
+        longest_eta = end_date + datetime.timedelta(days=add_day_end)
 
         format_time = '%d %b %Y'
         format_time_fastest = '%d %b' if fastest_eta.year == longest_eta.year else format_time