From b7b27287b7a4ab8bb59ee4fe42e1c75715e8b81b Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Thu, 6 Oct 2022 07:55:18 +0000
Subject: [PATCH] [FIX] website: correct creation wizard view

Having multiple groups one after the other will cause the labels to not
have the same width; converge all in a single group

closes odoo/odoo#102424

X-original-commit: c787b16421807355e58d3029a0941d3bdd65fad7
Signed-off-by: Bouvy Damien (dbo) <dbo@odoo.com>
---
 addons/website/views/website_views.xml | 32 +++++++++-----------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 00878e73186..25e4fcec836 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -26,26 +26,16 @@
             <field name="arch" type="xml">
                 <form string="Website Settings">
                     <sheet>
-                        <div name="domain">
-                            <group name="domain">
-                                <field name="name"/>
-                                <field name="domain"/>
-                            </group>
-                        </div>
-                        <div name="logo">
-                            <group name="logo">
-                                <field name="logo" widget="image" class="oe_avatar float-start"/>
-                            </group>
-                        </div>
-                        <div name="other">
-                            <group name="other">
-                                <field name="language_count" invisible="1"/>
-                                <field name="company_id" options="{'no_open': True, 'no_create': True}" groups="base.group_multi_company"/>
-                                <field name="language_ids" widget="many2many_tags" options="{'no_open': True, 'no_create': True}"/>
-                                <field name="default_lang_id" options="{'no_open': True, 'no_create': True}"
-                                       attrs="{'invisible': [('language_count', '&lt;=', 1)]}"/>
-                            </group>
-                        </div>
+                        <group name="domain">
+                            <field name="name"/>
+                            <field name="domain"/>
+                            <field name="logo" widget="image" class="oe_avatar float-start"/>
+                            <field name="language_count" invisible="1"/>
+                            <field name="company_id" options="{'no_open': True, 'no_create': True}" groups="base.group_multi_company"/>
+                            <field name="language_ids" widget="many2many_tags" options="{'no_open': True, 'no_create': True}"/>
+                            <field name="default_lang_id" options="{'no_open': True, 'no_create': True}"
+                                    attrs="{'invisible': [('language_count', '&lt;=', 1)]}"/>
+                        </group>
                         <notebook>
                             <page string="Custom Code" groups="base.group_no_one">
                                 <label for="custom_code_head"/>
@@ -73,7 +63,7 @@
                     </footer>
                 </xpath>
                 <xpath expr="//notebook" position="replace"/>
-                <xpath expr="//div[@name='logo']" position="replace"/>
+                <xpath expr="//field[@name='logo']" position="replace"/>
             </field>
         </record>