diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2024-05-22 10:14:55 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2024-05-22 10:14:55 +0700 |
| commit | 27380e8bbb8be5d0a81a4c5e0410686ce1ae5997 (patch) | |
| tree | 2f024ff01616f97f5c3df7d96f2f9149a6bfbe22 | |
| parent | 04c3476f86c7499573f28aa603126481fe4e0daa (diff) | |
fix error param and add some validation for date kirim
| -rw-r--r-- | indoteknik_custom/models/ged.py | 19 | ||||
| -rw-r--r-- | indoteknik_custom/views/dunning_run_ged.xml | 16 |
2 files changed, 21 insertions, 14 deletions
diff --git a/indoteknik_custom/models/ged.py b/indoteknik_custom/models/ged.py index a2e8bc3c..d1f70f1d 100644 --- a/indoteknik_custom/models/ged.py +++ b/indoteknik_custom/models/ged.py @@ -235,6 +235,10 @@ class GedApi(models.Model): status_detail = line['status_detail'] status = line['status'] + if status == 'Received At Warehouse' and not dunning_run.date_kirim_tukar_faktur: + dunning_run.date_kirim_tukar_faktur = line.created_at + dunning_run.copy_date_faktur() + param_line = { 'ged_tracking_id': ged_tracking_id, 'user_input': user_input, @@ -257,20 +261,21 @@ class DunningRunGed(models.Model): ged_tracking = fields.One2many('ged.tracking', 'dunning_id', string='GED Tracking', auto_join=True) ged_tracking_line = fields.One2many('ged.tracking.line', 'dunning_id', string='GED Tracking Line', auto_join=True) - def _get_tracking_history(self, test_awb_number): - if test_awb_number > 0: + def _get_tracking_history(self, awb_number='all_data'): + if awb_number == 'all_data': query = [ ('last_status_awb', '!=', 'POD Return'), - ('resi_tukar_faktur', '=', test_awb_number), - ('shipper_faktur_id', '=', 123) + ('resi_tukar_faktur', '!=', False), + ('shipper_faktur_id', '=', 123), + ('date_terima_tukar_faktur', '=', False) ] else: query = [ ('last_status_awb', '!=', 'POD Return'), - ('resi_tukar_faktur', '!=', False), - ('shipper_faktur_id', '=', 123), - ('date_terima_tukar_faktur', '=', False) + ('resi_tukar_faktur', '=', awb_number), + ('shipper_faktur_id', '=', 123) ] + dunnings = self.env['dunning.run'].search(query, limit=50) for dunning in dunnings: diff --git a/indoteknik_custom/views/dunning_run_ged.xml b/indoteknik_custom/views/dunning_run_ged.xml index ecda228d..1249c34d 100644 --- a/indoteknik_custom/views/dunning_run_ged.xml +++ b/indoteknik_custom/views/dunning_run_ged.xml @@ -6,13 +6,6 @@ <field name="model">dunning.run</field> <field name="inherit_id" ref="indoteknik_custom.dunning_run_form"/> <field name="arch" type="xml"> - <field name="is_validated" position="before"> - <button name="get_tracking_history_by_awb" - string="Get Tracking" - type="object" - class="oe_highlight oe_edit_only" - /> - </field> <page id="invoice_tab" position="after"> <page string="Tracking"> <field name="ged_tracking"/> @@ -21,6 +14,15 @@ <field name="ged_tracking_line"/> </page> </page> + <field name="shipper_faktur_id" position="after"> + <field name="last_status_awb" readonly="1"/> + </field> + <field name="notification" position="after"> + <button name="get_tracking_history_by_awb" + string="Get Tracking" + type="object" + /> + </field> </field> </record> </data> |