From e647a2de09dc01aae1d06ddb0ee0a8c03ca9ea46 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Tue, 4 Oct 2022 21:06:45 +0000
Subject: [PATCH] [IMP] *: adapt to grid form views

The recent switch from tables to css grids for form views `group` nodes
has introduced several inconsistencies/issues with several views accross
modules - these will not be the last fixes.

closes odoo/odoo#102174

X-original-commit: 836568dfd59886a6d52f15e0e2109709903b6803
Related: odoo/enterprise#32295
Signed-off-by: Bouvy Damien (dbo) <dbo@odoo.com>
---
 .../views/account_reconcile_model_views.xml   |   3 +-
 addons/account/views/partner_view.xml         |   4 +-
 addons/account/views/res_company_views.xml    |   4 +-
 .../wizard/account_move_reversal_view.xml     |   6 +-
 addons/auth_totp/views/res_users_views.xml    | 106 +++++++++---------
 addons/delivery/views/delivery_view.xml       |   2 +-
 addons/digest/views/digest_views.xml          |   6 +-
 addons/hr_expense/views/hr_expense_views.xml  |  18 +--
 addons/hr_timesheet/views/project_views.xml   |   6 +-
 addons/portal/wizard/portal_share_views.xml   |   4 -
 addons/product/views/product_views.xml        |   8 +-
 addons/purchase/views/product_views.xml       |   2 +-
 addons/sale/views/product_views.xml           |   4 +-
 addons/sale/views/res_partner_views.xml       |  16 +--
 addons/sale/views/sale_order_views.xml        |   4 +-
 addons/sale_stock/views/sale_order_views.xml  |   2 +-
 addons/sale_stock/views/stock_route_views.xml |   6 +-
 addons/stock/views/product_views.xml          |   6 +-
 addons/stock/views/stock_location_views.xml   |  35 +++---
 .../views/crm_lead_views.xml                  |   4 +-
 odoo/addons/base/views/res_country_views.xml  |  16 +--
 odoo/addons/base/views/res_partner_views.xml  |   2 +-
 odoo/addons/base/views/res_users_views.xml    |   8 +-
 .../wizard/base_language_install_views.xml    |  11 +-
 24 files changed, 137 insertions(+), 146 deletions(-)

diff --git a/addons/account/views/account_reconcile_model_views.xml b/addons/account/views/account_reconcile_model_views.xml
index c29a0e19a7c..d797674fb33 100644
--- a/addons/account/views/account_reconcile_model_views.xml
+++ b/addons/account/views/account_reconcile_model_views.xml
@@ -218,8 +218,7 @@
                                             </group>
                                         </group>
                                     </group>
-                                    <group string="Counterpart Entries"
-                                           class="oe_inline"
+                                    <group string="Counterpart Entries" colspan="4"
                                            attrs="{'invisible': [('rule_type', '=', 'invoice_matching'), '|', ('allow_payment_tolerance', '=', False), '&amp;', ('allow_payment_tolerance', '=', True), ('payment_tolerance_param', '=', 0.0)]}">
                                         <group>
                                             <field name="show_decimal_separator" invisible="1"/>
diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index b1db826d76e..54f9d464591 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -230,8 +230,8 @@
                                    groups="account.group_account_invoice,account.group_account_readonly"
                                    attrs="{'invisible': [('show_credit_limit', '=', False)]}">
                                 <field name="credit"/>
-                                <div name="partner_credit_limit" colspan="2" class="o_checkbox_optional_field">
-                                    <label for="use_partner_credit_limit"/>
+                                <label for="use_partner_credit_limit"/>
+                                <div class="o_row">
                                     <field name="use_partner_credit_limit"/>
                                     <field name="credit_limit" class="oe_inline" attrs="{'invisible': [('use_partner_credit_limit', '=', False)]}"/>
                                 </div>
diff --git a/addons/account/views/res_company_views.xml b/addons/account/views/res_company_views.xml
index d09bc0f51ab..65b5637a91c 100644
--- a/addons/account/views/res_company_views.xml
+++ b/addons/account/views/res_company_views.xml
@@ -24,9 +24,7 @@
         <field name="priority">1000</field>
         <field name="arch" type="xml">
             <form>
-                <group>
-                    <field name="invoice_terms_html" class="oe_account_terms" nolabel="1"/>
-                </group>
+                <field name="invoice_terms_html" class="oe_account_terms" nolabel="1"/>
                 <footer>
                     <button string="Save" special="save" class="btn-primary"/>
                     <button string="Discard" class="btn-secondary" special="cancel"/>
diff --git a/addons/account/wizard/account_move_reversal_view.xml b/addons/account/wizard/account_move_reversal_view.xml
index d67571d22ac..56b16d72db5 100644
--- a/addons/account/wizard/account_move_reversal_view.xml
+++ b/addons/account/wizard/account_move_reversal_view.xml
@@ -16,13 +16,13 @@
                             <field name="refund_method" widget="radio" attrs="{'readonly': [('residual', '=', 0)]}"/>
                          </group>
                          <group attrs="{'invisible': ['|', ('move_type', 'not in', ('out_invoice', 'in_invoice', 'some_invoice')), ('residual', '=', 0)]}">
-                            <div attrs="{'invisible':[('refund_method', '!=', 'refund')]}" class="oe_grey" colspan="4">
+                            <div attrs="{'invisible':[('refund_method', '!=', 'refund')]}" class="oe_grey" colspan="2">
                                The credit note is created in draft and can be edited before being issued.
                             </div>
-                            <div attrs="{'invisible':[('refund_method', '!=', 'cancel')]}" class="oe_grey" colspan="4">
+                            <div attrs="{'invisible':[('refund_method', '!=', 'cancel')]}" class="oe_grey" colspan="2">
                                The credit note is auto-validated and reconciled with the invoice.
                             </div>
-                            <div attrs="{'invisible':[('refund_method', '!=', 'modify')]}" class="oe_grey" colspan="4">
+                            <div attrs="{'invisible':[('refund_method', '!=', 'modify')]}" class="oe_grey" colspan="2">
                                The credit note is auto-validated and reconciled with the invoice.
                                The original invoice is duplicated as a new draft.
                             </div>
diff --git a/addons/auth_totp/views/res_users_views.xml b/addons/auth_totp/views/res_users_views.xml
index d6ccb5e0a45..88ef66f0394 100644
--- a/addons/auth_totp/views/res_users_views.xml
+++ b/addons/auth_totp/views/res_users_views.xml
@@ -22,17 +22,16 @@
                 <page string="Account Security" name="security" attrs="{'invisible': [('id', '=', False)]}">
                     <field name="totp_enabled" invisible="1"/>
                     <!-- For own user, allow to activate the two-factor Authentication -->
-                    <group>
-                        <div>
-                            <div class="o_horizontal_separator d-flex align-items-center mt-0">Two-factor Authentication
+                    <div>
+                        <div class="o_horizontal_separator d-flex align-items-center mt-0">Two-factor Authentication
                                 <div attrs="{'invisible': [('totp_enabled', '!=', False)]}">
                                     <button attrs="{'invisible': &quot;[('id', '=', uid)]&quot;}" name="action_totp_enable_wizard"
                                             disabled="1" type="object" class="fa fa-toggle-off o_auth_2fa_btn disabled" aria-label="Enable 2FA"></button>
-                                    <button attrs="{'invisible': &quot;[('id', '!=', uid)]&quot;}" name="action_totp_enable_wizard"
-                                        type="object" class="fa fa-toggle-off o_auth_2fa_btn disabled" aria-label="Enable 2FA"></button>
+                                            <button attrs="{'invisible': &quot;[('id', '!=', uid)]&quot;}" name="action_totp_enable_wizard"
+                                            type="object" class="fa fa-toggle-off o_auth_2fa_btn disabled" aria-label="Enable 2FA"></button>
                                 </div>
                                 <button attrs="{'invisible': [('totp_enabled', '=', False)]}" name="action_totp_disable" type="object"
-                                        class="fa fa-toggle-on o_auth_2fa_btn text-primary enabled" aria-label="Disable 2FA"></button>
+                                class="fa fa-toggle-on o_auth_2fa_btn text-primary enabled" aria-label="Disable 2FA"></button>
                             </div>
                             <span attrs="{'invisible': [('totp_enabled', '!=', False)]}" class="text-muted">
                                 Two-factor Authentication ("2FA") is a system of double authentication.
@@ -40,24 +39,23 @@
                                 Popular ones include Authy, Google Authenticator or the Microsoft Authenticator.
                                 <a href="https://www.odoo.com/documentation/master/applications/general/auth/2fa.html"
                                    title="Learn More" target="_blank">Learn More</a>
-                            </span>
-                            <span attrs="{'invisible': [('totp_enabled', '=', False)]}" class="text-muted">This account is protected!</span>
-                            <group name="auth_devices" string="Trusted Devices" attrs="{'invisible': [('totp_trusted_device_ids', '=', [])]}">
-                                <div colspan="2">
-                                    <field name="totp_trusted_device_ids" nolabel="1" colspan="4" readonly="1">
-                                        <tree create="false" delete="false">
-                                            <field name="name" string="Device"/>
-                                            <field name="create_date" string="Added On"/>
-                                            <button type="object" name="remove"
-                                                    title="Revoke" icon="fa-trash"/>
-                                        </tree>
-                                    </field>
-                                    <button name="revoke_all_devices" string="Revoke All" type="object" class="btn btn-secondary"
-                                            confirm="Are you sure? The user may be asked to enter two-factor codes again on those devices"/>
-                                </div>
-                            </group>
-                        </div>
-                    </group>
+                                </span>
+                                <span attrs="{'invisible': [('totp_enabled', '=', False)]}" class="text-muted">This account is protected!</span>
+                            </div>
+                        <group name="auth_devices" string="Trusted Devices" attrs="{'invisible': [('totp_trusted_device_ids', '=', [])]}">
+                            <div colspan="2">
+                                <field name="totp_trusted_device_ids" nolabel="1" colspan="4" readonly="1">
+                                    <tree create="false" delete="false">
+                                        <field name="name" string="Device"/>
+                                        <field name="create_date" string="Added On"/>
+                                        <button type="object" name="remove"
+                                                title="Revoke" icon="fa-trash"/>
+                                    </tree>
+                                </field>
+                                <button name="revoke_all_devices" string="Revoke All" type="object" class="btn btn-secondary"
+                                        confirm="Are you sure? The user may be asked to enter two-factor codes again on those devices"/>
+                            </div>
+                        </group>
                 </page>
             </xpath>
         </field>
@@ -70,38 +68,36 @@
         <field name="arch" type="xml">
             <group name="auth" position="after">
                 <field name="totp_enabled" invisible="1"/>
-                <group>
-                    <div>
-                        <div class="o_horizontal_separator mt-0">Two-factor Authentication
-                            <button attrs="{'invisible': [('totp_enabled', '!=', False)]}" name="action_totp_enable_wizard"
-                               type="object" class="fa fa-toggle-off o_auth_2fa_btn mb-1" aria-label="Enable 2FA"/>
-                            <button attrs="{'invisible': [('totp_enabled', '=', False)]}" name="action_totp_disable"
-                               type="object" class="fa fa-toggle-on o_auth_2fa_btn text-primary" aria-label="Disable 2FA"/>
-                        </div>
-                        <span attrs="{'invisible': [('totp_enabled', '=', False)]}" class="text-muted">Your account is protected!</span>
-                        <span attrs="{'invisible': [('totp_enabled', '!=', False)]}" class="text-muted">
-                            Two-factor Authentication ("2FA") is a system of double authentication.
-                            The first one is done with your password and the second one with a code you get from a dedicated mobile app.
-                            Popular ones include Authy, Google Authenticator or the Microsoft Authenticator.
-                            <a href="https://www.odoo.com/documentation/master/applications/general/auth/2fa.html"
-                               title="Learn More" target="_blank">Learn More</a>
-                        </span>
-                        <group name="auth_devices" string="Trusted Devices" attrs="{'invisible': [('totp_trusted_device_ids', '=', [])]}">
-                            <div colspan="2">
-                                <field name="totp_trusted_device_ids" nolabel="1" colspan="4" readonly="1">
-                                    <tree create="false" delete="false">
-                                        <field name="name" string="Device"/>
-                                        <field name="create_date" string="Added On"/>
-                                        <button type="object" name="remove"
-                                                title="Revoke" icon="fa-trash"/>
-                                    </tree>
-                                </field>
-                                <button name="revoke_all_devices" string="Revoke All" type="object" class="btn btn-secondary"
-                                        confirm="Are you sure? You may be asked to enter two-factor codes again on those devices"/>
-                            </div>
-                        </group>
+                <div>
+                    <div class="o_horizontal_separator mt-0">Two-factor Authentication
+                        <button attrs="{'invisible': [('totp_enabled', '!=', False)]}" name="action_totp_enable_wizard"
+                            type="object" class="fa fa-toggle-off o_auth_2fa_btn mb-1" aria-label="Enable 2FA"/>
+                        <button attrs="{'invisible': [('totp_enabled', '=', False)]}" name="action_totp_disable"
+                            type="object" class="fa fa-toggle-on o_auth_2fa_btn text-primary" aria-label="Disable 2FA"/>
                     </div>
-                </group>
+                    <span attrs="{'invisible': [('totp_enabled', '=', False)]}" class="text-muted">Your account is protected!</span>
+                    <span attrs="{'invisible': [('totp_enabled', '!=', False)]}" class="text-muted">
+                        Two-factor Authentication ("2FA") is a system of double authentication.
+                        The first one is done with your password and the second one with a code you get from a dedicated mobile app.
+                        Popular ones include Authy, Google Authenticator or the Microsoft Authenticator.
+                        <a href="https://www.odoo.com/documentation/master/applications/general/auth/2fa.html"
+                            title="Learn More" target="_blank">Learn More</a>
+                    </span>
+                    <group name="auth_devices" string="Trusted Devices" attrs="{'invisible': [('totp_trusted_device_ids', '=', [])]}">
+                        <div colspan="2">
+                            <field name="totp_trusted_device_ids" nolabel="1" colspan="4" readonly="1">
+                                <tree create="false" delete="false">
+                                    <field name="name" string="Device"/>
+                                    <field name="create_date" string="Added On"/>
+                                    <button type="object" name="remove"
+                                            title="Revoke" icon="fa-trash"/>
+                                </tree>
+                            </field>
+                            <button name="revoke_all_devices" string="Revoke All" type="object" class="btn btn-secondary"
+                                    confirm="Are you sure? You may be asked to enter two-factor codes again on those devices"/>
+                        </div>
+                    </group>
+                </div>
             </group>
         </field>
     </record>
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 6a9d7a62e61..cda06a489d4 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -123,7 +123,7 @@
                             </page>
                             <page string="Destination Availability" name="destination">
                                 <group>
-                                    <p>
+                                    <p colspan="2">
                                         Filling this form allows you to filter delivery carriers according to the delivery address of your customer.
                                     </p>
                                 </group>
diff --git a/addons/digest/views/digest_views.xml b/addons/digest/views/digest_views.xml
index 4cf13d690ee..fd7af2075fb 100644
--- a/addons/digest/views/digest_views.xml
+++ b/addons/digest/views/digest_views.xml
@@ -55,8 +55,10 @@
                                 </group>
                                 <group name="kpi_sales"/>
                                 <group name="custom" string="Custom" groups="base.group_system">
-                                    <p>Want to add your own KPIs?<br />
-                                    <a href="https://www.odoo.com/documentation/master/applications/general/digest_emails.html#custom-digest-emails" target="_blank"><i class="fa fa-arrow-right"></i> Check our Documentation</a></p>
+                                    <div colspan="2">
+                                        <p>Want to add your own KPIs?<br />
+                                        <a href="https://www.odoo.com/documentation/master/applications/general/digest_emails.html#custom-digest-emails" target="_blank"><i class="fa fa-arrow-right"></i> Check our Documentation</a></p>
+                                    </div>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index ba5d93d529f..3e3ea45f2c8 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -160,15 +160,15 @@
                             </div>
 
                             <label for="total_amount" string="Total" attrs="{'invisible': [('product_has_cost', '=', True)]}"/>
-                            <div attrs="{'invisible': [('product_has_cost', '=', True)]}">
-                                <div class="row" attrs="{'invisible': [('product_has_cost', '=', True)]}">
-                                    <field name="total_amount" widget='monetary' options="{'currency_field': 'currency_id'}" attrs="{'readonly': [('sheet_is_editable', '=', False)]}" class="w-50"/>
-                                    <field name="currency_id" groups="base.group_multi_currency" class="ps-2 w-50"/>
-                                </div>
-                                <div class="row" attrs="{'invisible': [('same_currency', '=', True), ('product_has_cost', '=', False)]}">
-                                    <field name="total_amount_company" widget='monetary' options="{'currency_field': 'company_currency_id'}" class="w-lg-50"/>
-                                    <field name="label_convert_rate" class="ps-0 w-lg-50"/>
-                                </div>
+                            <div class="o_row" attrs="{'invisible': [('product_has_cost', '=', True)]}">
+                                <field name="total_amount" widget='monetary' options="{'currency_field': 'currency_id'}" attrs="{'readonly': [('sheet_is_editable', '=', False)]}" class="oe_inline"/>
+                                <field name="currency_id" groups="base.group_multi_currency"/>
+                            </div>
+                            <label for="total_amount_company" attrs="{'invisible': [('product_has_cost', '=', False)]}"/>
+                            <label for="label_convert_rate" string="" attrs="{'invisible': [('same_currency', '=', True), ('product_has_cost', '=', False)]}"/>
+                            <div colspan="1" class="o_row" name="currency_exchange_div" attrs="{'invisible': [('same_currency', '=', True), ('product_has_cost', '=', False)]}">
+                                <field name="total_amount_company" class="oe_inline" widget='monetary' options="{'currency_field': 'company_currency_id'}"/>
+                                <field name="label_convert_rate" class=""/>
                             </div>
                             <label for="tax_ids" attrs="{'invisible': [('product_has_tax', '=', False)]}"/>
                             <div class="d-flex o_row">
diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index 0424b2ccfc2..4442f0e803d 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -127,9 +127,9 @@
                     <page string="Timesheets" id="timesheets_tab" attrs="{'invisible': [('allow_timesheets', '=', False)]}" groups="hr_timesheet.group_hr_timesheet_user">
                         <group>
                             <group>
-                                <div class="o_td_label">
-                                    <label for="planned_hours" string="Allocated Hours" attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
-                                    <label for="planned_hours" string="Allocated Days" attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
+                                <label for="planned_hours" string="Allocated Hours" attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
+                                <label for="planned_hours" string="Allocated Days" attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
+                                <div class="o_row">
                                     <field name="planned_hours" class="oe_inline ms-2" widget="timesheet_uom_no_toggle"/>
                                     <span attrs="{'invisible': ['|', ('allow_subtasks', '=', False), ('subtask_count', '=', 0)]}">
                                         (incl. <field name="subtask_planned_hours" nolabel="1" groups="project.group_subtask_project" widget="timesheet_uom_no_toggle" class="oe_inline"/> on
diff --git a/addons/portal/wizard/portal_share_views.xml b/addons/portal/wizard/portal_share_views.xml
index f9ef8eb2e14..d32a31d0faf 100644
--- a/addons/portal/wizard/portal_share_views.xml
+++ b/addons/portal/wizard/portal_share_views.xml
@@ -10,11 +10,7 @@
                     <field name="res_model" invisible="1"/>
                     <field name="res_id" invisible="1"/>
                     <field name="share_link" widget="CopyClipboardChar" options="{'string': 'Copy Link'}"/>
-                </group>
-                <group>
                     <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to share the document..."/>
-                </group>
-                <group>
                     <field name="note" placeholder="Add a note"/>
                 </group>
                 <footer>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 31483b4ba0d..f84caa9736b 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -97,7 +97,7 @@
                                 </group>
                             </group>
                             <group string="Internal Notes">
-                                <field name="description" nolabel="1" placeholder="This note is only for internal purposes."/>
+                                <field colspan="2" name="description" nolabel="1" placeholder="This note is only for internal purposes."/>
                             </group>
                         </page>
                         <page string="Sales" attrs="{'invisible':[('sale_ok','=',False)]}" name="sales" invisible="1">
@@ -106,7 +106,7 @@
                             </group>
                             <group>
                                 <group string="Sales Description" name="description">
-                                    <field name="description_sale" nolabel="1" placeholder="This note is added to sales orders and invoices."/>
+                                    <field colspan="2" name="description_sale" nolabel="1" placeholder="This note is added to sales orders and invoices."/>
                                 </group>
                             </group>
                         </page>
@@ -134,7 +134,7 @@
                                 colspan="4"
                                 attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"
                                 groups="product.group_stock_packaging">
-                                <field name="packaging_ids" nolabel="1" context="{'tree_view_ref':'product.product_packaging_tree_view2', 'default_company_id': company_id}"/>
+                                <field colspan="2" name="packaging_ids" nolabel="1" context="{'tree_view_ref':'product.product_packaging_tree_view2', 'default_company_id': company_id}"/>
                             </group>
                         </page>
                     </notebook>
@@ -288,7 +288,7 @@
                                 </div>
                             </group>
                             <group name="packaging" string="Packaging" groups="product.group_stock_packaging">
-                                <field name="packaging_ids" nolabel="1"
+                                <field colspan="2" name="packaging_ids" nolabel="1"
                                     context="{'tree_view_ref':'product.product_packaging_tree_view2', 'default_company_id': company_id}"/>
                             </group>
                         </group>
diff --git a/addons/purchase/views/product_views.xml b/addons/purchase/views/product_views.xml
index f01bc975d01..25d9fc41d59 100644
--- a/addons/purchase/views/product_views.xml
+++ b/addons/purchase/views/product_views.xml
@@ -53,7 +53,7 @@
                 <group name="purchase" position="inside">
                     <group col="1">
                         <group string="Purchase Description">
-                           <field name="description_purchase" nolabel="1"
+                           <field name="description_purchase" nolabel="1" colspan="2"
                                 placeholder="This note is added to purchase orders."/>
                         </group>
                         <group string="Warning when Purchasing this Product" groups="purchase.group_warning_purchase">
diff --git a/addons/sale/views/product_views.xml b/addons/sale/views/product_views.xml
index e22e98eef86..c0d9721e1f2 100644
--- a/addons/sale/views/product_views.xml
+++ b/addons/sale/views/product_views.xml
@@ -93,8 +93,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" string="Warning"/>
+                        <field name="sale_line_warn_msg" string="Message" placeholder="Type a message..."
                                 attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')], 'invisible':[('sale_line_warn','=','no-message')]}"/>
                     </group>
                 </t>
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index bec0bce3c03..d744f8dad37 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -51,14 +51,16 @@
                     <field string="Sales" name="sale_order_count" widget="statinfo"/>
                 </button>
             </div>
-            <page name="internal_notes" position="inside">
-                <group colspan="2" col="2" groups="sale.group_warning_sale,sales_team.group_sale_salesman">
-                    <separator string="Warning on the Sales Order" colspan="4" />
-                    <field name="sale_warn" nolabel="1" />
-                    <field name="sale_warn_msg" colspan="3" nolabel="1"
-                            attrs="{'required':[('sale_warn','!=', False), ('sale_warn','!=','no-message')], 'invisible':[('sale_warn','in',(False,'no-message'))]}"/>
+            <xpath expr="//page[@name='internal_notes']//field[@name='comment']" position="before">
+                <group groups="sale.group_warning_sale,sales_team.group_sale_salesman">
+                    <group>
+                        <separator string="Warning on the Sales Order" />
+                        <field name="sale_warn" string="Warning" />
+                        <field name="sale_warn_msg" string="Message" placeholder="Type a message..."
+                                attrs="{'required':[('sale_warn','!=', False), ('sale_warn','!=','no-message')], 'invisible':[('sale_warn','in',(False,'no-message'))]}"/>
+                    </group>
                 </group>
-            </page>
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index a072ec6ac5d..19178134cb6 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -583,7 +583,7 @@
                         </field>
                         <group name="note_group" col="6" class="mt-2 mt-md-0">
                             <group colspan="4">
-                                <field name="note" nolabel="1" placeholder="Terms and conditions..."/>
+                                <field  colspan="2" name="note" nolabel="1" placeholder="Terms and conditions..."/>
                             </group>
                             <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
                                 <field name="tax_totals" widget="account-tax-totals-field" nolabel="1" colspan="2" readonly="1"/>
@@ -632,7 +632,7 @@
                                 <label for="commitment_date" string="Delivery Date"/>
                                 <div name="commitment_date_div" class="o_row">
                                     <field name="commitment_date"/>
-                                    <span name="expected_date_span" class="text-muted">Expected: <field name="expected_date" widget="date"/></span>
+                                    <span name="expected_date_span" class="text-muted">Expected: <field name="expected_date" class="oe_inline" widget="date"/></span>
                                 </div>
                             </group>
                             <group string="Tracking" name="sale_reporting">
diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index db489459731..915beb712d2 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -34,7 +34,7 @@
                 <xpath expr="//div[@name='commitment_date_div']" position="replace">
                     <div class="o_row">
                         <field name="commitment_date"/>
-                        <span class="text-muted" attrs="{'invisible': [('effective_date', '!=', False), ('commitment_date', '!=', False)]}">Expected: <field name="expected_date" widget="date"/></span>
+                        <span class="text-muted" attrs="{'invisible': [('effective_date', '!=', False), ('commitment_date', '!=', False)]}">Expected: <field name="expected_date" class="oe_inline" widget="date"/></span>
                     </div>
                     <field name="effective_date" attrs="{'invisible': [('effective_date', '=', False)]}"/>
                 </xpath>
diff --git a/addons/sale_stock/views/stock_route_views.xml b/addons/sale_stock/views/stock_route_views.xml
index 4ed2e92b7bf..c7edba52b79 100644
--- a/addons/sale_stock/views/stock_route_views.xml
+++ b/addons/sale_stock/views/stock_route_views.xml
@@ -6,9 +6,9 @@
         <field name="model">stock.route</field>
         <field name="inherit_id" ref="stock.stock_location_route_form_view"/>
         <field name="arch" type="xml">
-            <field name="warehouse_ids" position="after">
-                <br/><field name="sale_selectable" string="Sales Order Lines"/>
-            </field>
+            <xpath expr="//group[@name='route_selector']/group[last()]" position="inside">
+                <field name="sale_selectable" string="Sales Order Lines"/>
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index bbbf54ddbe5..328d4e7925f 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -134,13 +134,13 @@
                 <page name="inventory" position="inside">
                     <group>
                         <group string="Description for Receipts">
-                            <field name="description_pickingin" nolabel="1" placeholder="This note is added to receipt orders (e.g. where to store the product in the warehouse)."/>
+                            <field name="description_pickingin" colspan="2" nolabel="1" placeholder="This note is added to receipt orders (e.g. where to store the product in the warehouse)."/>
                         </group>
                         <group string="Description for Delivery Orders">
-                            <field name="description_pickingout" nolabel="1" placeholder="This note is added to delivery orders."/>
+                            <field name="description_pickingout" colspan="2" nolabel="1" placeholder="This note is added to delivery orders."/>
                         </group>
                         <group string="Description for Internal Transfers" groups="stock.group_stock_multi_locations">
-                            <field name="description_picking" placeholder="This note is added to internal transfer orders (e.g. where to pick the product in the warehouse)." nolabel="1"/>
+                            <field name="description_picking" colspan="2" placeholder="This note is added to internal transfer orders (e.g. where to pick the product in the warehouse)." nolabel="1"/>
                         </group>
                     </group>
                 </page>
diff --git a/addons/stock/views/stock_location_views.xml b/addons/stock/views/stock_location_views.xml
index b6d63bcaf0a..b219c7b82f7 100644
--- a/addons/stock/views/stock_location_views.xml
+++ b/addons/stock/views/stock_location_views.xml
@@ -194,32 +194,25 @@
                             <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                         </group>
                     </group>
-                    <separator string="Applicable On"/>
-                    <p class="oe_grey">Select the places where this route can be selected</p>
-                    <group>
+                    <group string="Applicable On" name="route_selector">
+                        <p colspan="2" class="oe_grey">Select the places where this route can be selected</p>
                         <group>
-                            <label for="product_categ_selectable" string="Product Categories"/>
-                            <div>
-                                <field name="product_categ_selectable" class="oe_inline"/>
-                            </div>
-                            <label for="product_selectable" string="Products"/>
-                            <div>
-                                <field name="product_selectable" class="oe_inline"/>
-                            </div>
-                            <label for="packaging_selectable" string="Packagings" groups="product.group_stock_packaging"/>
-                            <div groups="product.group_stock_packaging">
-                                <field name="packaging_selectable" class="oe_inline"/>
-                            </div>
+                            <field name="product_categ_selectable" string="Product Categories"/>
+                            <field name="product_selectable" string="Products"/>
+                            <field name="packaging_selectable" string="Packagings" groups="product.group_stock_packaging"/>
                         </group>
                         <group>
-                            <field name="warehouse_selectable" string="Warehouses"/>
-                            <field name="warehouse_domain_ids" invisible="1"/>
-                            <field name="warehouse_ids"  widget="many2many_tags" nolabel="1"
-                                   attrs="{'invisible': [('warehouse_selectable', '=', False)]}"/>
+                            <label for="warehouse_selectable" string="Warehouses"/>
+                            <div class="o_row">
+                                <field name="warehouse_selectable" class="oe_inline" nolabel="1"/>
+                                <field name="warehouse_domain_ids" invisible="1"/>
+                                <field name="warehouse_ids"  widget="many2many_tags" nolabel="1"
+                                       attrs="{'invisible': [('warehouse_selectable', '=', False)]}"/>
+                            </div>
                         </group>
                     </group>
-                    <group string="Rules" colspan="4" >
-                        <field name="rule_ids" colspan="4" nolabel="1" context="{'default_company_id': company_id, 'form_view_ref':'stock.view_route_rule_form'}">
+                    <group string="Rules" >
+                        <field name="rule_ids" colspan="2" nolabel="1" context="{'default_company_id': company_id, 'form_view_ref':'stock.view_route_rule_form'}">
                             <tree>
                                 <field name="sequence" widget="handle"/>
                                 <field name="action"/>
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index bbbed2dd1b1..b96de9c8f29 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -19,7 +19,9 @@
                                 <span class="oe_grey" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
                                 <span class="oe_grey">) </span>
                             </div>
-                            <button string="Automatic Assignment" name="action_assign_partner" type="object" class="btn-link"/>
+                            <div colspan="2">
+                                <button string="Automatic Assignment" name="action_assign_partner" type="object" class="btn-link"/>
+                            </div>
 
                             <field name="partner_assigned_id" domain="[('grade_id','!=',False)]" context="{'partner_set_default_grade_activation': 1}"/>
                             <button string="Send Email" type="action" class="btn-link"
diff --git a/odoo/addons/base/views/res_country_views.xml b/odoo/addons/base/views/res_country_views.xml
index 4037b156b71..2eb9c1f35d2 100644
--- a/odoo/addons/base/views/res_country_views.xml
+++ b/odoo/addons/base/views/res_country_views.xml
@@ -23,7 +23,7 @@
                     <sheet>
                         <div class="oe_button_box">
                         </div>
-                        <field name="image_url" widget="image_url" class="oe_avatar"/>
+                        <field name="image_url" widget="image_url" class="oe_avatar" options="{'size': [128,128]}"/>
                         <group name="main_group">
                             <group name="country_details">
                                 <field name="name"/>
@@ -36,13 +36,13 @@
                                 <field name="zip_required"/>
                                 <field name="state_required"/>
                             </group>
-                            <group name="advanced_address_formatting" string="Advanced Address Formatting" groups="base.group_no_one" col="4" colspan="4">
-                                <field name="address_view_id"/>
-                                <div colspan="2" class="text-muted">Choose a subview of partners that includes only address fields, to change the way users can input addresses.</div>
-                                <field name="address_format" placeholder="Address format..."/>
-                                <div colspan="2" name="div_address_format" class="text-muted">Change the way addresses are displayed in reports</div>
-                                <field name="name_position"/>
-                            </group>
+                        </group>
+                        <group name="advanced_address_formatting" string="Advanced Address Formatting" groups="base.group_no_one" col="4" colspan="4">
+                            <field name="address_view_id" colspan="2"/>
+                            <div colspan="2" class="text-muted">Choose a subview of partners that includes only address fields, to change the way users can input addresses.</div>
+                            <field name="address_format" placeholder="Address format..." colspan="2"/>
+                            <div colspan="2" name="div_address_format" class="text-muted">Change the way addresses are displayed in reports</div>
+                            <field name="name_position" colspan="2"/>
                         </group>
                         <label for="state_ids"/>
                         <field name="state_ids">
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 4179fa26080..b1140f155ab 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -332,7 +332,7 @@
                                             </group>
                                         </group>
                                         <group>
-                                            <field name="comment" placeholder="Internal notes..." nolabel="1"/>
+                                            <field name="comment" placeholder="Internal notes..." nolabel="1" colspan="2"/>
                                         </group>
                                         <field name="lang" invisible="True"/>
                                         <field name="user_id" invisible="True"/>
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 0cf268a0e23..b3bad0105a7 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -485,14 +485,16 @@
                         </page>
                         <page string="Account Security">
                             <group name="auth" string="Password Management">
-                                <div>
+                                <div colspan="2">
                                     <button name="preference_change_password" type="object" string="Change password" class="btn btn-secondary"/>
                                 </div>
                             </group>
-                            <group groups="base.group_no_one">
-                                <div class="o_horizontal_separator">Developer API Keys
+                            <group string="API Keys">
+                                <div class="text-muted" colspan="2">
+                                    API Keys are used to connect to Odoo from external tools without the need for a password or Two-factor Authentication.
                                     <a href="https://www.odoo.com/documentation/master/developer/misc/api/external_api.html#api-keys" target="_blank">
                                         <i title="Documentation" class="fa fa-fw o_button_icon fa-info-circle"></i>
+                                        Learn more
                                     </a>
                                 </div>
                                 <div colspan="2" attrs="{'invisible': [('api_key_ids', '=', [])]}">
diff --git a/odoo/addons/base/wizard/base_language_install_views.xml b/odoo/addons/base/wizard/base_language_install_views.xml
index a8bdaea0ed0..c2e47caa10b 100644
--- a/odoo/addons/base/wizard/base_language_install_views.xml
+++ b/odoo/addons/base/wizard/base_language_install_views.xml
@@ -8,12 +8,13 @@
             <field name="priority">100</field>
             <field name="arch" type="xml">
                 <form string="Switch to language">
-                    <group>
-                        <span class="o_form_label">
-                            <strong><field name="first_lang_id" readonly="True" options="{'no_open': True}"/></strong> has been successfully installed.
+                    <div>
+                        <strong>
+                            <field name="first_lang_id" readonly="True" options="{'no_open': True}" />
+                        </strong>
+                        has been successfully installed.
                             Users can choose their favorite language in their preferences.
-                        </span>
-                    </group>
+                    </div>
                     <footer>
                         <button name="reload" string="Close" type="object" class="btn-primary" data-hotkey="q"/>
                         <button name="switch_lang" type="object" class="btn-primary ms-1" data-hotkey="w">