From 9bf4d5fdfe93d76e4a4fce77b1efaa94ad07a89e Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Sat, 21 Oct 2023 13:09:30 +0200
Subject: [PATCH] [FIX] upgrade_analysis: Proper UI in forms

The colspan property of some UI elements were not correctly adjusted to
the v16 sytem.

This commits fixes it.
---
 .../views/view_upgrade_analysis.xml             |  3 ++-
 upgrade_analysis/views/view_upgrade_record.xml  |  4 ++--
 .../wizards/upgrade_install_wizard.py           |  1 +
 .../view_upgrade_generate_record_wizard.xml     |  6 ++++--
 .../wizards/view_upgrade_install_wizard.xml     | 17 ++++++++++-------
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/upgrade_analysis/views/view_upgrade_analysis.xml b/upgrade_analysis/views/view_upgrade_analysis.xml
index 71edfbbcd..8ec396787 100644
--- a/upgrade_analysis/views/view_upgrade_analysis.xml
+++ b/upgrade_analysis/views/view_upgrade_analysis.xml
@@ -27,7 +27,7 @@
                     />
                 </header>
                 <sheet>
-                    <group col="4" colspan="4">
+                    <group>
                         <field name="config_id" readonly="state == 'done'" />
                         <field name="write_files" readonly="state == 'done'" />
                         <field name="upgrade_path" invisible="not write_files" />
@@ -39,6 +39,7 @@
                             nolabel="1"
                             widget="ace"
                             options="{'mode': 'txt'}"
+                            colspan="2"
                         />
                     </group>
 
diff --git a/upgrade_analysis/views/view_upgrade_record.xml b/upgrade_analysis/views/view_upgrade_record.xml
index 675423da2..9cb3463cb 100644
--- a/upgrade_analysis/views/view_upgrade_record.xml
+++ b/upgrade_analysis/views/view_upgrade_record.xml
@@ -44,7 +44,7 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                    <group col="4" colspan="4">
+                    <group>
                         <field name="name" />
                         <field name="module" />
                         <field name="model" />
@@ -53,7 +53,7 @@
                         <field name="mode" />
                     </group>
                     <group string="Attributes">
-                        <field name="attribute_ids" nolabel="1" colspan="4">
+                        <field name="attribute_ids" nolabel="1" colspan="2">
                             <tree>
                                 <field name="name" />
                                 <field name="value" />
diff --git a/upgrade_analysis/wizards/upgrade_install_wizard.py b/upgrade_analysis/wizards/upgrade_install_wizard.py
index 295f4b23b..968a28c8b 100644
--- a/upgrade_analysis/wizards/upgrade_install_wizard.py
+++ b/upgrade_analysis/wizards/upgrade_install_wizard.py
@@ -24,6 +24,7 @@ class UpgradeInstallWizard(models.TransientModel):
     module_ids = fields.Many2many(
         comodel_name="ir.module.module",
         domain=lambda x: x._module_ids_domain(),
+        string="Modules",
     )
 
     module_qty = fields.Integer(
diff --git a/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml b/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml
index d18690091..039e5d983 100644
--- a/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml
+++ b/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml
@@ -8,12 +8,14 @@
                 <header>
                   <field name="state" widget="statusbar" />
                 </header>
-                <group invisible="state != 'draft'" colspan="4">
+                <group invisible="state != 'draft'">
                     <p
+                        colspan="2"
                     >This will reinitialize all the modules installed on this database. Do not continue if you use this database in production.</p>
                 </group>
-                <group invisible="state != 'done'" colspan="4">
+                <group invisible="state != 'done'">
                     <p>Modules initialized and record created</p>
+                    <p colspan="2">Modules initialized and record created</p>
                 </group>
                 <footer>
                     <button
diff --git a/upgrade_analysis/wizards/view_upgrade_install_wizard.xml b/upgrade_analysis/wizards/view_upgrade_install_wizard.xml
index 0ec6a5f40..a7cbc6307 100644
--- a/upgrade_analysis/wizards/view_upgrade_install_wizard.xml
+++ b/upgrade_analysis/wizards/view_upgrade_install_wizard.xml
@@ -12,15 +12,17 @@
                     <p
                         class="alert alert-warning"
                         role="alert"
+                        colspan="2"
                     >This will install the selected modules on the database. Do not continue if you use this database in production.</p>
                 </group>
                 <group invisible="state != 'done'">
                     <p
                         class="alert alert-info"
                         role="alert"
+                        colspan="2"
                     >The modules have been installed successfuly</p>
                 </group>
-                <group col="4" invisible="state != 'draft'">
+                <header invisible="state != 'draft'">
                     <button
                         name="select_installable_modules"
                         type="object"
@@ -42,7 +44,13 @@
                         type="object"
                         string="All Other Modules"
                     />
-                </group>
+                </header>
+                <button
+                    name="unselect_modules"
+                    type="object"
+                    string="Clear the list"
+                    invisible="state != 'draft'"
+                />
                 <group invisible="state != 'draft'">
                     <field name="module_qty" />
                     <field
@@ -50,11 +58,6 @@
                         widget="many2many_tags"
                         options="{'no_create': True}"
                     />
-                    <button
-                        name="unselect_modules"
-                        type="object"
-                        string="Clear the list"
-                    />
                 </group>
                 <footer>
                     <button