Merge branch 'production' of https://bitbucket.org/altafixco/indoteknik-addons into production

1 files changed, 5 insertions, 3 deletions

diff --git a/indoteknik_custom/models/delivery_order.py b/indoteknik_custom/models/delivery_order.py
index be5fd2e0..2ed49a54 100644
--- a/indoteknik_custom/models/delivery_order.py
+++ b/indoteknik_custom/models/delivery_order.py
@@ -37,7 +37,7 @@ class DeliveryOrder(models.TransientModel):
                 if delivery_type == 'departure':
                     picking.driver_departure_date = current_time
                 elif delivery_type == 'arrival':
-                    picking.driver_arrival_date = current_time
+                    picking.sj_return_date = datetime.utcnow()
 
                     sale_order = False
                     if picking.origin:
@@ -103,14 +103,16 @@ class DeliveryOrderLine(models.TransientModel):
 
                 delivery_type = self.get_delivery_type(picking.driver_departure_date, picking.driver_arrival_date)
                 if delivery_type != 'departure':
-                    self.departure_date = picking.driver_departure_date.astimezone(timezone('Asia/Jakarta')).strftime('%Y-%m-%d %H:%M:%S')
+                    if picking.driver_departure_date:
+                        self.departure_date = picking.driver_departure_date.astimezone(timezone('Asia/Jakarta')).strftime('%Y-%m-%d %H:%M:%S')
 
                 if delivery_type == 'departure':
                     self.departure_date = current_time
                 elif delivery_type == 'arrival':
                     self.arrival_date = current_time
                 else:
-                    self.arrival_date = picking.driver_arrival_date.astimezone(timezone('Asia/Jakarta')).strftime('%Y-%m-%d %H:%M:%S')
+                    if picking.driver_arrival_date:
+                        self.arrival_date = picking.driver_arrival_date.astimezone(timezone('Asia/Jakarta')).strftime('%Y-%m-%d %H:%M:%S')
             else:
                 raise UserError('Nomor DO tidak ditemukan')