diff options
| -rw-r--r-- | indoteknik_custom/models/dunning_run.py | 27 | ||||
| -rw-r--r-- | indoteknik_custom/models/ged.py | 29 |
2 files changed, 29 insertions, 27 deletions
diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py index b5b8acb5..8f17fea6 100644 --- a/indoteknik_custom/models/dunning_run.py +++ b/indoteknik_custom/models/dunning_run.py @@ -107,33 +107,6 @@ class DunningRun(models.Model): result = super(DunningRun, self).create(vals) return result - def _get_tracking_history(self, test_awb_number): - if test_awb_number: - query = [ - ('last_status', '!=', 'POD Return'), - ('resi_tukar_faktur', '=', test_awb_number), - ('shipper_faktur_id', '=', 123) - ] - else: - query = [ - ('last_status', '!=', 'POD Return'), - ('resi_tukar_faktur', '!=', False), - ('shipper_faktur_id', '=', 123) - ] - dunnings = self.env['dunning.run'].search(query) - - for dunning in dunnings: - current_tracking = self.env['ged.tracking'].search([('awb_no', '=', dunning.resi_tukar_faktur)], limit=1) - if current_tracking: - current_tracking.unlink() - else: - ged_api = self.env['ged.api'] - last_status = ged_api.get_tracking_awb(dunning.id) - if not last_status: - dunning.last_status_awb = last_status - return - - class DunningRunLine(models.Model): _name = 'dunning.run.line' diff --git a/indoteknik_custom/models/ged.py b/indoteknik_custom/models/ged.py index 4502ce0b..b63caf86 100644 --- a/indoteknik_custom/models/ged.py +++ b/indoteknik_custom/models/ged.py @@ -229,3 +229,32 @@ class GedApi(models.Model): return header_last_status + +class DunningRunGed(models.Model): + _inherit = 'dunning.run' + + def _get_tracking_history(self, test_awb_number): + if test_awb_number: + query = [ + ('last_status', '!=', 'POD Return'), + ('resi_tukar_faktur', '=', test_awb_number), + ('shipper_faktur_id', '=', 123) + ] + else: + query = [ + ('last_status', '!=', 'POD Return'), + ('resi_tukar_faktur', '!=', False), + ('shipper_faktur_id', '=', 123) + ] + dunnings = self.env['dunning.run'].search(query) + + for dunning in dunnings: + current_tracking = self.env['ged.tracking'].search([('awb_no', '=', dunning.resi_tukar_faktur)], limit=1) + if current_tracking: + current_tracking.unlink() + else: + ged_api = self.env['ged.api'] + last_status = ged_api.get_tracking_awb(dunning.id) + if not last_status: + dunning.last_status_awb = last_status + return |