From 7aab866654cc0f6a2d02a9df382b1e5eaa77d287 Mon Sep 17 00:00:00 2001
From: "Chrysanthe (chgo)" <chgo@odoo.com>
Date: Tue, 30 May 2023 08:44:02 +0000
Subject: [PATCH] [FIX] hr_holidays: display option layout

=== ISSUE ===

If you navigate to Time Off > Configuration > Time Off Types and open a
type, the layout of the display option is not consistent.

The option should be displayed under the title and not next to it.

=== AFTER ===

We remove the empty `group` tag and add the `string` attribute to the
second one, in order to fix he layout.

task-3332666
part of task-3326263

closes odoo/odoo#124403

X-original-commit: cdd41cef07cb82b37e7c09b8f4a622ac7dde81a3
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 .../static/src/radio_image_field/radio_image_field.xml |  2 +-
 addons/hr_holidays/views/hr_leave_type_views.xml       | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/static/src/radio_image_field/radio_image_field.xml b/addons/hr_holidays/static/src/radio_image_field/radio_image_field.xml
index d52262b6be2..9b7b65d3a7b 100644
--- a/addons/hr_holidays/static/src/radio_image_field/radio_image_field.xml
+++ b/addons/hr_holidays/static/src/radio_image_field/radio_image_field.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="hr_holidays.RadioImageField" owl="1">
-        <div role="radiogroup" class="d-flex flex-wrap" t-att-aria-label="string">
+        <div role="radiogroup" class="d-flex flex-wrap gap-4" t-att-aria-label="string">
             <t t-if="props.readonly">
                 <t t-if="value !== false">
                     <div>
diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml
index 159c21c5e88..d2fdd917206 100644
--- a/addons/hr_holidays/views/hr_leave_type_views.xml
+++ b/addons/hr_holidays/views/hr_leave_type_views.xml
@@ -79,13 +79,9 @@
                             <field name="allocation_validation_type" string="Approval" widget="radio" attrs="{'invisible': ['|', ('requires_allocation', '=', 'no'), ('employee_requests', '=', 'no')]}"/>
                         </group>
                     </group>
-                    <group name="visual" id="visual" >
-                        <group colspan="2" string="Display Option">
-                        </group>
-                        <group colspan="2">
-                            <field name="color" widget="color_picker" />
-                            <field class="o_time_off_icon_types d-flex flex-wrap" name="icon_id" widget="hr_holidays_radio_image" options="{'horizontal': true}"/>
-                        </group>
+                    <group name="visual" id="visual" string="Display Option" class="mw-100 col-lg-12">
+                        <field name="color" widget="color_picker" />
+                        <field class="o_time_off_icon_types d-flex flex-wrap" name="icon_id" widget="hr_holidays_radio_image" options="{'horizontal': true}"/>
                     </group>
                 </sheet>
             </form>