diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-11-28 10:43:58 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-11-28 10:43:58 +0700 |
| commit | b1af79a0ed73a7af2557c8269d82bbc99afaa601 (patch) | |
| tree | 6bf2ef8aec570bcb05b59a504ebeece215383845 /indoteknik_custom/models/logbook_sj.py | |
| parent | 56f2deda9cdf2a51d5a53aade7758a0ac9313e05 (diff) | |
| parent | 58bec36c52b223c12fd15511a56ab417ebbd7257 (diff) | |
Merge branch 'production' into iman/switch-account
# Conflicts:
# indoteknik_api/models/res_users.py
Diffstat (limited to 'indoteknik_custom/models/logbook_sj.py')
| -rw-r--r-- | indoteknik_custom/models/logbook_sj.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indoteknik_custom/models/logbook_sj.py b/indoteknik_custom/models/logbook_sj.py index f84619ad..9f349882 100644 --- a/indoteknik_custom/models/logbook_sj.py +++ b/indoteknik_custom/models/logbook_sj.py @@ -101,14 +101,16 @@ class LogbookSJLine(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') |