From 2be025dfa542b25cc89fe70694ad5c11bc2df3bd Mon Sep 17 00:00:00 2001
From: Adrien Schoffeniels <adsc@odoo.com>
Date: Mon, 9 Jan 2023 16:43:09 +0000
Subject: [PATCH] [FIX] base: fix merge contact form layout

Purpose:
========
This commit removes the weird blank space at the edges of the merge contact
form (using custom css that will be removed in master), and displays the
info message and the associated action button shown when there are no more
contacts to merge inside two separate rows, instead of displaying them next
to each other (by adding `colspan="2"` on these elements).

Task-3112116

closes odoo/odoo#110887

X-original-commit: eb7e5de05a5b05054bffbcf3892cf2c432e3295a
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 odoo/addons/base/static/src/scss/res_partner.scss    | 9 +++++++++
 odoo/addons/base/wizard/base_partner_merge_views.xml | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/odoo/addons/base/static/src/scss/res_partner.scss b/odoo/addons/base/static/src/scss/res_partner.scss
index 8f9b8859904..0935e1de1ec 100644
--- a/odoo/addons/base/static/src/scss/res_partner.scss
+++ b/odoo/addons/base/static/src/scss/res_partner.scss
@@ -27,3 +27,12 @@
     }
 
 }
+
+.o_partner_merge_wizard {
+    .o_form_sheet {
+        padding: 12px !important;
+    }
+    .row {
+        --gutter-x: 0;
+    }
+}
diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml
index e11ff319928..98e9f248484 100644
--- a/odoo/addons/base/wizard/base_partner_merge_views.xml
+++ b/odoo/addons/base/wizard/base_partner_merge_views.xml
@@ -12,11 +12,11 @@
             <field name='name'>base.partner.merge.automatic.wizard.form</field>
             <field name='model'>base.partner.merge.automatic.wizard</field>
             <field name='arch' type='xml'>
-                <form string='Automatic Merge Wizard'>
+                <form string='Automatic Merge Wizard' class="o_partner_merge_wizard">
                     <sheet>
-                        <group attrs="{'invisible': [('state', '!=', 'finished')]}" col="1">
-                            <h2>There are no more contacts to merge for this request</h2>
-                            <button name="%(action_partner_deduplicate)d" string="Deduplicate the other Contacts" class="oe_highlight" type="action"/>
+                        <group attrs="{'invisible': [('state', '!=', 'finished')]}">
+                            <h2 colspan="2">There are no more contacts to merge for this request</h2>
+                            <button name="%(action_partner_deduplicate)d" string="Deduplicate the other Contacts" class="oe_highlight" type="action" colspan="2"/>
                         </group>
                         <p class="oe_grey" attrs="{'invisible': [('state', '!=', ('option'))]}">
                             Select the list of fields used to search for