From 29febb9980f2d35fe408b75fe33404be4bb1cf90 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Thu, 30 Dec 2021 14:52:40 +0100
Subject: [PATCH] [IMP] sale(_*): merge product views

No need to have 3 views inheriting the same base
`product.product_template_form_view`
---
 addons/sale/views/product_views.xml           | 64 +++++++------------
 addons/sale_project/views/product_views.xml   |  2 +-
 addons/sale_timesheet/views/product_views.xml |  2 +-
 3 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/addons/sale/views/product_views.xml b/addons/sale/views/product_views.xml
index 788f21fdade..2c3ee71f6c1 100644
--- a/addons/sale/views/product_views.xml
+++ b/addons/sale/views/product_views.xml
@@ -1,15 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <!-- TODO VFE remove useless view (same change done in view below) -->
     <record id="product_template_form_view" model="ir.ui.view">
-        <field name="name">product.template.product.website.form</field>
+        <field name="name">product.template.form.view.inherit.sale</field>
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_form_view"/>
         <field name="arch" type="xml">
             <page name="sales" position="attributes">
                 <attribute name="invisible">0</attribute>
             </page>
+            <field name="product_variant_count" position="after">
+                <field name="service_type" widget="radio" invisible="True"/>
+                <field name="visible_expense_policy" invisible="1"/>
+            </field>
+            <field name="detailed_type" position="after">
+                <field name="invoice_policy" required="1"/>
+                <field name="expense_policy" widget="radio" attrs="{'invisible': [('visible_expense_policy', '=', False)]}"/>
+            </field>
+            <field name="product_tooltip" position="after">
+                <label for="product_tooltip" string=""
+                    attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'order')]}"/>
+                <div attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'order')]}"
+                    class="font-italic text-muted">
+                    You can invoice them before they are delivered.
+                </div>
+                <label for="product_tooltip" string=""
+                    attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'delivery')]}"/>
+                <div attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'delivery')]}"
+                    class="font-italic text-muted">
+                    Invoice after delivery, based on quantities delivered, not ordered.
+                </div>
+            </field>
         </field>
     </record>
 
@@ -79,45 +100,6 @@
         </field>
     </record>
 
-    <!-- TODO VFE merge both views -->
-    <record model="ir.ui.view" id="product_template_form_view_invoice_policy">
-        <field name="name">product.template.invoice.policy</field>
-        <field name="model">product.template</field>
-        <field name="priority">15</field>
-        <field name="inherit_id" ref="product.product_template_form_view"/>
-        <field name="arch" type="xml">
-            <field name="product_variant_count" position="after">
-                <field name="service_type" widget="radio" invisible="True"/>
-                <field name="visible_expense_policy" invisible="1"/>
-            </field>
-            <field name="detailed_type" position="after">
-                <field name="invoice_policy" required="1"/>
-                <field name="expense_policy" widget="radio" attrs="{'invisible': [('visible_expense_policy', '=', False)]}"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="product_template_sale_form_view">
-        <field name="name">product.template.sales</field>
-        <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_form_view"/>
-        <field name="arch" type="xml">
-            <group name="sale" position="attributes">
-                <attribute name="invisible">0</attribute>
-            </group>
-            <field name="product_tooltip" position="after">
-                <label for="product_tooltip" string="" attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'order')]}"/>
-                <div attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'order')]}" class="font-italic text-muted">
-                    You can invoice them before they are delivered.
-                </div>
-                <label for="product_tooltip" string="" attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'delivery')]}"/>
-                <div attrs="{'invisible': ['|', ('type', 'not in', ('product', 'consu')), ('invoice_policy', '!=', 'delivery')]}" class="font-italic text-muted">
-                    Invoice after delivery, based on quantities delivered, not ordered.
-                </div>
-            </field>
-        </field>
-    </record>
-
     <record id="product_template_action" model="ir.actions.act_window">
         <field name="name">Products</field>
         <field name="type">ir.actions.act_window</field>
diff --git a/addons/sale_project/views/product_views.xml b/addons/sale_project/views/product_views.xml
index 73ae817211e..14ee5f6ba6a 100644
--- a/addons/sale_project/views/product_views.xml
+++ b/addons/sale_project/views/product_views.xml
@@ -4,7 +4,7 @@
     <record id="product_template_form_view_invoice_policy_inherit_sale_project" model="ir.ui.view">
         <field name="name">product.template.inherit.sale.projectform</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
+        <field name="inherit_id" ref="sale.product_template_form_view"/>
         <field name="arch" type="xml">
             <field name="invoice_policy" position="after">
                 <field name="service_tracking" required="1" attrs="{'invisible': [('type', '!=', 'service')]}"/>
diff --git a/addons/sale_timesheet/views/product_views.xml b/addons/sale_timesheet/views/product_views.xml
index 09080b4fa98..fdadf529ab9 100644
--- a/addons/sale_timesheet/views/product_views.xml
+++ b/addons/sale_timesheet/views/product_views.xml
@@ -3,7 +3,7 @@
     <record id="view_product_timesheet_form" model="ir.ui.view">
         <field name="name">product.template.timesheet.form</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
+        <field name="inherit_id" ref="sale.product_template_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='invoice_policy']" position="attributes">
                 <attribute name="invisible">False</attribute>