From eb514d364cc27b7ab52d2724d14740fc48178acc Mon Sep 17 00:00:00 2001
From: Kevin Baptiste <kba@odoo.com>
Date: Mon, 3 Oct 2022 12:05:54 +0000
Subject: [PATCH] [FIX] fleet,hr_(recruitment|attendance): fix post-always edit

This PR adapts the form views since the merge of odoo/odoo#100570.

task-3002465

closes odoo/odoo#102488

X-original-commit: 56b877c2cbeeaf3bd6e42645db691467a1ba4ff4
Related: odoo/enterprise#32431
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 .../fleet/views/fleet_vehicle_cost_views.xml  | 23 +++++++++----------
 .../fleet/views/res_config_settings_views.xml |  2 +-
 .../views/res_config_settings_views.xml       | 10 ++++----
 .../wizard/applicant_refuse_reason_views.xml  |  6 ++---
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
index a215180e825..24721a1ec45 100644
--- a/addons/fleet/views/fleet_vehicle_cost_views.xml
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -35,10 +35,12 @@
                     </group>
                     <group col="2">
                         <group>
-                            <field name="amount" string="Activation Cost" help="Cost that is paid only once at the creation of the contract" widget="monetary"/>
+                            <field name="amount" string="Activation Cost" help="Cost that is paid only once at the creation of the contract" widget="monetary" class="w-25"/>
                             <label for="cost_generated"/>
                             <div class="o_row">
-                                <field name="cost_generated" attrs="{'invisible': [('cost_frequency','=','no')]}" widget="monetary"/>
+                                <span class="w-25">
+                                    <field name="cost_generated" attrs="{'invisible': [('cost_frequency','=','no')]}" widget="monetary"/>
+                                </span>
                                 <field name="cost_frequency"/>
                             </div>
                         </group>
@@ -48,12 +50,10 @@
                             <field name="expiration_date" attrs="{'required': [('cost_frequency', '!=', 'no')]}"/>
                         </group>
                     </group>
-                    <group string="Included Services">
-                        <field name="service_ids" widget="many2many_tags" nolabel="1"/>
-                    </group>
-                    <group string="Terms and Conditions">
-                        <field name="notes" nolabel="1" placeholder="Write here all other information relative to this contract" />
-                    </group>
+                    <separator string="Included Services"/>
+                    <field name="service_ids" widget="many2many_tags" nolabel="1"/>
+                    <separator string="Terms and Conditions"/>
+                    <field name="notes" nolabel="1" placeholder="Write here all other information relative to this contract" />
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids"/>
@@ -238,14 +238,13 @@
                             <field name="purchaser_id"/>
                             <label for="odometer"/>
                             <div class="o_row">
-                                <field name="odometer" class="oe_inline"/>
+                                <field name="odometer" class="w-25"/>
                                 <field name="odometer_unit" class="ps-1 ps-sm-0"/>
                             </div>
                         </group>
                     </group>
-                    <group string="Notes">
-                        <field nolabel="1" name="notes" placeholder="Write here any other information related to the service completed."/>
-                    </group>
+                    <separator string="Notes"/>
+                    <field nolabel="1" name="notes" placeholder="Write here any other information related to the service completed."/>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids"/>
diff --git a/addons/fleet/views/res_config_settings_views.xml b/addons/fleet/views/res_config_settings_views.xml
index 27a22aa9e0a..6e45bb0c1e9 100644
--- a/addons/fleet/views/res_config_settings_views.xml
+++ b/addons/fleet/views/res_config_settings_views.xml
@@ -17,7 +17,7 @@
                                     <span class="o_form_label">End Date Contract Alert</span>
                                     <div class="text-muted content-group mt16">
                                         <span>Send an alert </span>
-                                        <field name="delay_alert_contract" class="text-center oe_inline" />
+                                        <field name="delay_alert_contract" class="text-center" style="width: 10%; min-width: 4rem;" />
                                         <span> days before the end date</span>
                                     </div>
                                 </div>
diff --git a/addons/hr_attendance/views/res_config_settings_views.xml b/addons/hr_attendance/views/res_config_settings_views.xml
index f2026cf5aca..ead55677f25 100644
--- a/addons/hr_attendance/views/res_config_settings_views.xml
+++ b/addons/hr_attendance/views/res_config_settings_views.xml
@@ -37,7 +37,7 @@
                                 </div>
                                 <div class="content-group">
                                     <div class="mt16">
-                                        <field name="attendance_kiosk_delay" required="1" class="text-center oe_inline"/> seconds
+                                        <field name="attendance_kiosk_delay" required="1" class="text-center" style="width: 10%; min-width: 4rem;"/> seconds
                                     </div>
                                 </div>
                             </div>
@@ -97,8 +97,8 @@
                                     <div class="text-muted">
                                         Allow a period of time (around working hours) where extra time will not be counted, in benefit of the company
                                     </div>
-                                    <span>Time Period </span><field name="overtime_company_threshold" class="text-center oe_inline"
-                                        attrs="{'required': [('hr_attendance_overtime', '=', True)]}"/><span> Minutes</span>
+                                    <span>Time Period </span><field name="overtime_company_threshold" class="text-center"
+                                        attrs="{'required': [('hr_attendance_overtime', '=', True)]}" style="width: 10%; min-width: 4rem;"/><span> Minutes</span>
                                     <br/>
                                     <br/>
                                     <label for="overtime_employee_threshold" class="o_form_label">
@@ -107,8 +107,8 @@
                                     <div class="text-muted">
                                         Allow a period of time (around working hours) where extra time will not be deducted, in benefit of the employee
                                     </div>
-                                    <span>Time Period </span><field name="overtime_employee_threshold" class="text-center oe_inline"
-                                        attrs="{'required': [('hr_attendance_overtime', '=', True)]}"/><span> Minutes</span>
+                                    <span>Time Period </span><field name="overtime_employee_threshold" class="text-center"
+                                        attrs="{'required': [('hr_attendance_overtime', '=', True)]}" style="width: 10%; min-width: 4rem;"/><span> Minutes</span>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml b/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml
index 9b173630025..794d80f6f21 100644
--- a/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml
+++ b/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml
@@ -8,10 +8,10 @@
                     <div class="alert alert-danger" role="alert" attrs="{'invisible': [('applicant_without_email', '=', False)]}">
                         <field name="applicant_without_email" class="mr4"/>
                     </div>
-                    <group class="oe_title">
-                        <field name="refuse_reason_id"/>
+                    <group col="1">
+                        <field name="refuse_reason_id" class="w-50"/>
                         <field name="send_mail" attrs="{'invisible': [('refuse_reason_id', '=', False)]}"/>
-                        <field name="template_id" attrs="{'invisible': [('send_mail', '=', False)], 'required': [('send_mail', '=', True)]}"/>
+                        <field name="template_id" attrs="{'invisible': [('send_mail', '=', False)], 'required': [('send_mail', '=', True)]}" class="w-50"/>
                         <field name="applicant_ids" invisible="1"/>
                     </group>
                     <footer>