From 6233c37f1448c8e004264505ecaa282b705df7be Mon Sep 17 00:00:00 2001
From: Nans Lefebvre <len@odoo.com>
Date: Fri, 22 Mar 2019 08:53:57 +0000
Subject: [PATCH] [FIX] sale_stock: hide redundant incoterms_id field

The field incoterms_id is made redundant by the field incoterm_id introduced in
b5bb5bd421. As such, it has been removed in master at: 569a498d360
We make this field invisible,
and synchronize the invoice incoterm_id with the sale order incoterm.

opw 1935573

closes odoo/odoo#32039

Signed-off-by: Nans Lefebvre (len) <len@odoo.com>
---
 addons/sale_stock/models/sale_order.py            | 2 ++
 addons/sale_stock/views/account_invoice_views.xml | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py
index 4c2ad3262d3..41cd9b7ccc6 100644
--- a/addons/sale_stock/models/sale_order.py
+++ b/addons/sale_stock/models/sale_order.py
@@ -128,6 +128,8 @@ class SaleOrder(models.Model):
     def _prepare_invoice(self):
         invoice_vals = super(SaleOrder, self)._prepare_invoice()
         invoice_vals['incoterms_id'] = self.incoterm.id or False
+        if self.incoterm.id:
+            invoice_vals['incoterm_id'] = self.incoterm.id
         return invoice_vals
 
     @api.model
diff --git a/addons/sale_stock/views/account_invoice_views.xml b/addons/sale_stock/views/account_invoice_views.xml
index ed8e07b1a54..e7d2dc1daa6 100644
--- a/addons/sale_stock/views/account_invoice_views.xml
+++ b/addons/sale_stock/views/account_invoice_views.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//page[@name='other_info']//field[@name='origin']" position="after">
-                <field name="incoterms_id" widget="selection" groups="sale_stock.group_display_incoterm"/>
+                <field name="incoterms_id" widget="selection" groups="sale_stock.group_display_incoterm" invisible="1"/>
                 </xpath>
             </data>
         </field>
@@ -16,9 +16,9 @@
     <template id="report_invoice_document_inherit_sale_stock" inherit_id="account.report_invoice_document">
         <!-- HTML Preview for mobile responsive -->
         <xpath expr="//div[@name='reference']" position="after">
-            <div t-att-class="o_grid_layout" t-if="o.incoterms_id" groups="sale_stock.group_display_incoterm">
+            <div t-att-class="o_grid_layout" t-if="o.incoterm_id" groups="sale_stock.group_display_incoterm">
                 <strong>Incoterms:</strong>
-                <p t-field="o.incoterms_id.code"/>
+                <p t-field="o.incoterm_id.code"/>
             </div>
         </xpath>
     </template>