From 5f2017e544aa640167684d9b1de6e3ef74dc063a Mon Sep 17 00:00:00 2001
From: Romeo Fragomeli <rfr@odoo.com>
Date: Tue, 4 Oct 2022 09:58:56 +0000
Subject: [PATCH] [FIX] purchase,sale: adapt colspan in form view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since the usage of the `CSS Grid` some view are broken due to too much
CSS rules conflicting together.
The new form view system is less tolerant to missing colspan.
This commit, change the colspan when needed (e.g. no label)

Steps to reproduce:
* Go to sale
* Select the product menu
* Select a product (e.g. Printer)
* Some fields on the form view (in panel) are not aligned => BUG

closes odoo/odoo#102246

X-original-commit: 4813d1ebd4295c8be7ee6b6a892604f15cc43fce
Related: odoo/enterprise#32320
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
Signed-off-by: Romeo Fragomeli (rfr) <rfr@odoo.com>
---
 addons/purchase/views/product_views.xml | 4 ++--
 addons/sale/views/product_views.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/views/product_views.xml b/addons/purchase/views/product_views.xml
index 14b32d32adb..3b4cd0fc502 100644
--- a/addons/purchase/views/product_views.xml
+++ b/addons/purchase/views/product_views.xml
@@ -60,8 +60,8 @@
                                 placeholder="This note is added to purchase orders."/>
                         </group>
                         <group string="Warning when Purchasing this Product" groups="purchase.group_warning_purchase">
-                            <field name="purchase_line_warn" nolabel="1"/>
-                            <field name="purchase_line_warn_msg" colspan="3" nolabel="1"
+                            <field name="purchase_line_warn" nolabel="1" colspan="2"/>
+                            <field name="purchase_line_warn_msg" colspan="2" nolabel="1"
                                 attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')], 'invisible':[('purchase_line_warn','=','no-message')]}"/>
                         </group>
                     </group>
diff --git a/addons/sale/views/product_views.xml b/addons/sale/views/product_views.xml
index 4ed777931cb..e22e98eef86 100644
--- a/addons/sale/views/product_views.xml
+++ b/addons/sale/views/product_views.xml
@@ -60,8 +60,8 @@
             <group name="description" position="after">
                 <t groups="sales_team.group_sale_salesman">
                     <group string="Warning when Selling this Product" groups="sale.group_warning_sale">
-                        <field name="sale_line_warn" nolabel="1"/>
-                        <field name="sale_line_warn_msg" colspan="3" nolabel="1"
+                        <field name="sale_line_warn" nolabel="1" colspan="2"/>
+                        <field name="sale_line_warn_msg" colspan="2" nolabel="1"
                                 attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
                     </group>
                 </t>