From 28a2c49d4209d58e953365c5c148c995d503d182 Mon Sep 17 00:00:00 2001
From: JF Aubert <ajf@odoo.com>
Date: Tue, 4 Oct 2022 12:07:03 +0000
Subject: [PATCH] [FIX] product,purchase,mrp_subcontracting: adjust product &
 supplier info ui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Within Purchase tab:
- Make Quantity hidden by default.
- Move Currency right after Price.
Move Purchase Description to the right of Vendor Bills.

closes odoo/odoo#102702

Task: 3004014
X-original-commit: b3e78b5a8f825650123004a8b8677aaacfe6b43e
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
Signed-off-by: Jean-François Aubert <ajf@odoo.com>
---
 addons/mrp_subcontracting/views/supplier_info_views.xml | 2 +-
 addons/product/views/product_supplierinfo_views.xml     | 6 +++---
 addons/purchase/views/product_views.xml                 | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/mrp_subcontracting/views/supplier_info_views.xml b/addons/mrp_subcontracting/views/supplier_info_views.xml
index e140e79f5b9..817cde666e2 100644
--- a/addons/mrp_subcontracting/views/supplier_info_views.xml
+++ b/addons/mrp_subcontracting/views/supplier_info_views.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="product.product_supplierinfo_tree_view"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="is_subcontractor" readonly="1"/>
+                <field name="is_subcontractor" readonly="1" optional="hide"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/product/views/product_supplierinfo_views.xml b/addons/product/views/product_supplierinfo_views.xml
index f06d1ee9f34..2587f9d3755 100644
--- a/addons/product/views/product_supplierinfo_views.xml
+++ b/addons/product/views/product_supplierinfo_views.xml
@@ -107,13 +107,13 @@
                     invisible="context.get('visible_product_tmpl_id', True)"/>
                 <field name="product_name" optional="hide"/>
                 <field name="product_code" optional="hide"/>
-                <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" readonly="1" groups="base.group_multi_company"/>
-                <field name="min_qty"/>
-                <field name="product_uom" groups="uom.group_uom"/>
+                <field name="min_qty" optional="hide"/>
+                <field name="product_uom" groups="uom.group_uom" optional="hide"/>
                 <field name="price" string="Price"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="delay" optional="hide"/>
             </tree>
         </field>
diff --git a/addons/purchase/views/product_views.xml b/addons/purchase/views/product_views.xml
index 3b4cd0fc502..f01bc975d01 100644
--- a/addons/purchase/views/product_views.xml
+++ b/addons/purchase/views/product_views.xml
@@ -19,9 +19,6 @@
                     <attribute name="readonly">0</attribute>
                     <attribute name="optional">hide</attribute>
                 </xpath>
-                <xpath expr="//field[@name='min_qty']" position="attributes">
-                    <attribute name="optional">show</attribute>
-                </xpath>
                 <xpath expr="//field[@name='partner_id']" position="attributes">
                     <attribute name="readonly">0</attribute>
                 </xpath>
@@ -53,8 +50,8 @@
                 <group name="bill" position="inside">
                     <field name="purchase_method" widget="radio"/>
                 </group>
-                <page name="purchase" position="inside">
-                    <group>
+                <group name="purchase" position="inside">
+                    <group col="1">
                         <group string="Purchase Description">
                            <field name="description_purchase" nolabel="1"
                                 placeholder="This note is added to purchase orders."/>
@@ -65,7 +62,7 @@
                                 attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')], 'invisible':[('purchase_line_warn','=','no-message')]}"/>
                         </group>
                     </group>
-                </page>
+                </group>
             </field>
         </record>