diff --git a/addons/account/data/account_incoterms_data.xml b/addons/account/data/account_incoterms_data.xml index 12b21e7b843..a3623a3a67b 100644 --- a/addons/account/data/account_incoterms_data.xml +++ b/addons/account/data/account_incoterms_data.xml @@ -33,25 +33,9 @@ CIP CARRIAGE AND INSURANCE PAID TO - - DAF - DELIVERED AT FRONTIER - - - DES - DELIVERED EX SHIP - - - DEQ - DELIVERED EX QUAY - - - DDU - DELIVERED DUTY UNPAID - - - DAT - DELIVERED AT TERMINAL + + DPU + DELIVERED AT PLACE UNLOADED DAP diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml index 2c493fda8bf..9a570a57af2 100644 --- a/addons/account/views/report_invoice.xml +++ b/addons/account/views/report_invoice.xml @@ -178,6 +178,9 @@

+

+ Incoterm: - +

Scan me with your banking app.

diff --git a/addons/purchase_stock/models/purchase.py b/addons/purchase_stock/models/purchase.py index 729f220ac80..f5b215281bb 100644 --- a/addons/purchase_stock/models/purchase.py +++ b/addons/purchase_stock/models/purchase.py @@ -135,6 +135,11 @@ class PurchaseOrder(models.Model): result['res_id'] = pick_ids.id return result + def action_view_invoice(self): + result = super().action_view_invoice() + result['context']['default_invoice_incoterm_id'] = self.incoterm_id.id + return result + # -------------------------------------------------- # Business methods # -------------------------------------------------- diff --git a/addons/purchase_stock/report/purchase_report_templates.xml b/addons/purchase_stock/report/purchase_report_templates.xml index 0c5a42fd0da..89acd21a429 100644 --- a/addons/purchase_stock/report/purchase_report_templates.xml +++ b/addons/purchase_stock/report/purchase_report_templates.xml @@ -13,6 +13,12 @@ + +

+ Incoterm: +

+

+