From c1d55ba5f74fab00df76ed31ea6ef2425505c993 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Tue, 23 May 2023 11:47:36 +0000
Subject: [PATCH] [IMP] sale: improve form layout

Having 2 groups one after the other like this caused the labels to have
different sizes.

closes odoo/odoo#122089

Signed-off-by: Bouvy Damien (dbo) <dbo@odoo.com>
---
 addons/sale/views/sale_order_views.xml     | 12 ++++--------
 addons/sale_crm/views/sale_order_views.xml |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index 0fc40e9c6ae..6e58e6f829f 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -700,14 +700,10 @@
                                 </div>
                             </group>
                             <group string="Tracking" name="sale_reporting">
-                                <group name="technical" colspan="2" class="mb-0">
-                                    <field name="origin"/>
-                                </group>
-                                <group name="utm_link" colspan="2" class="mt-0">
-                                    <field name="campaign_id" options="{'create_name_field': 'title', 'always_reload': True}"/>
-                                    <field name="medium_id"/>
-                                    <field name="source_id"/>
-                                </group>
+                                <field name="origin"/>
+                                <field name="campaign_id" options="{'create_name_field': 'title', 'always_reload': True}"/>
+                                <field name="medium_id"/>
+                                <field name="source_id"/>
                             </group>
                         </group>
                     </page>
diff --git a/addons/sale_crm/views/sale_order_views.xml b/addons/sale_crm/views/sale_order_views.xml
index 0eba2abcf43..dec4ccf576f 100644
--- a/addons/sale_crm/views/sale_order_views.xml
+++ b/addons/sale_crm/views/sale_order_views.xml
@@ -14,7 +14,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='technical']" position="inside">
+            <xpath expr="//field[@name='origin']" position="after">
                 <field name="opportunity_id" context="{'default_type': 'opportunity'}"/>
             </xpath>
         </field>