From e3f029c33fe66d9b059192ca4d2263c5c77e04ed Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Mon, 19 Aug 2019 10:00:49 +0000
Subject: [PATCH] [IMP] product: UX improvements in form view

---
 addons/product/views/product_template_views.xml |  2 +-
 addons/product/views/product_views.xml          | 10 +++++-----
 addons/purchase/views/product_views.xml         |  8 ++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml
index 35d6fc0726e..ab5fea4f027 100644
--- a/addons/product/views/product_template_views.xml
+++ b/addons/product/views/product_template_views.xml
@@ -53,7 +53,7 @@
                             <field name="value_ids" widget="many2many_tags" options="{'no_create_edit': True}" context="{'default_attribute_id': attribute_id, 'show_attribute': False}"/>
                         </tree>
                     </field>
-                        <p class="oe_grey">
+                        <p class="oe_grey oe_edit_only">
                         <strong>Warning</strong>: adding or deleting attributes
                         will delete and recreate existing variants and lead
                         to the loss of their possible customizations.
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index d44c4fe9c02..1896b213685 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -654,15 +654,15 @@
                 <tree string="Vendor Information">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="product_id" invisible="context.get('product_template_invisible_variant', False)" groups="product.group_product_variant"/>
+                    <field name="product_id" invisible="context.get('product_template_invisible_variant', False)" groups="product.group_product_variant" optional="hide"/>
                     <field name="product_tmpl_id" string="Product" invisible="context.get('visible_product_tmpl_id', True)"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
+                    <field name="date_start" optional="hide"/>
+                    <field name="date_end" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="min_qty"/>
                     <field name="product_uom" groups="uom.group_uom"/>
                     <field name="price" string="Price"/>
-                    <field name="currency_id" groups="base.group_multi_currency"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/purchase/views/product_views.xml b/addons/purchase/views/product_views.xml
index 7ef8d0e9272..745676309b2 100644
--- a/addons/purchase/views/product_views.xml
+++ b/addons/purchase/views/product_views.xml
@@ -12,12 +12,8 @@
                     <attribute name="invisible">0</attribute>
                 </xpath>
                 <group name="purchase" position="before">
-                    <group string="Vendors" name="vendors" attrs="{'invisible': [('product_variant_count','&gt;',1)]}">
-                        <field name="seller_ids" context="{'default_product_tmpl_id':context.get('product_tmpl_id',active_id), 'product_template_invisible_variant': True}" nolabel="1"/>
-                    </group>
-                    <group string="Vendors" name="variant_vendors" attrs="{'invisible': [('product_variant_count','&lt;=',1)]}">
-                        <field name="variant_seller_ids" context="{'default_product_tmpl_id': context.get('product_tmpl_id', active_id)}" nolabel="1"/>
-                    </group>
+                    <field name="seller_ids" context="{'default_product_tmpl_id':context.get('product_tmpl_id',active_id), 'product_template_invisible_variant': True}" nolabel="1" attrs="{'invisible': [('product_variant_count','&gt;',1)]}"/>
+                    <field name="variant_seller_ids" context="{'default_product_tmpl_id': context.get('product_tmpl_id', active_id)}" nolabel="1" attrs="{'invisible': [('product_variant_count','&lt;=',1)]}"/>
                 </group>
                 <group name="bill" position="attributes">
                     <attribute name="groups">purchase.group_purchase_manager</attribute>