From aadf7ca9f82e8a11ebaae79062287191ef5f5ee2 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Thu, 6 Oct 2022 13:02:37 +0000
Subject: [PATCH] [FIX] hr(_*): update for grid views

X-original-commit: ea6497a73f4e20d02d02376bf766080735d8ec52
Part-of: odoo/odoo#102508
---
 addons/hr_contract/views/hr_contract_views.xml    |  6 +++---
 addons/hr_holidays/views/hr_leave_type_views.xml  | 15 ++++-----------
 .../views/hr_leave_views.xml                      |  9 ++++++---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index eb3e8dddf29..557a0ef0336 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -208,7 +208,7 @@
                             <page string="Contract Details" name="other" groups="hr_contract.group_hr_contract_manager">
                                 <group><group name="contract_details"/></group>
                                 <group name="notes_group" string="Notes">
-                                    <field name="notes" nolabel="1"/>
+                                    <field name="notes" nolabel="1" colspan="2" placeholder="Type in notes about this contract..."/>
                                 </group>
                             </page>
                             <page string="Salary Information" name="information" class="o_hr_contract_salary_information">
@@ -216,8 +216,8 @@
                                     <group name="salary">
                                         <label for="wage"/>
                                         <div class="o_row" name="wage">
-                                            <field name="wage" nolabel="1"/>
-                                            <span>/ month</span>
+                                            <field name="wage" class="oe_inline" nolabel="1"/>
+                                            <div>/ month</div>
                                         </div>
                                     </group>
                                     <group name="yearly_advantages"/>
diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml
index a047afe5d59..28a1ef92281 100644
--- a/addons/hr_holidays/views/hr_leave_type_views.xml
+++ b/addons/hr_holidays/views/hr_leave_type_views.xml
@@ -60,8 +60,7 @@
                         <h1><field name="name"/></h1>
                     </div>
                     <group>
-                        <group name="leave_validation" id="time_off_requests">
-                            <h2>Time Off Requests</h2>
+                        <group name="leave_validation" id="time_off_requests" string="Time Off Requests">
                             <field name="active" invisible="1"/>
                             <field name="leave_validation_type" string="Approval" widget="radio"/>
                             <field name="responsible_id" domain="[('share', '=', False)]"
@@ -73,22 +72,16 @@
                             <field name="time_type" required="1"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group name="allocation_validation" id="allocation_requests">
-                        <h2>Allocation Requests</h2>
+                        <group name="allocation_validation" id="allocation_requests" string="Allocation Requests">
                             <field name="requires_allocation" widget="radio" options="{'horizontal':true}"/>
                             <field name="employee_requests" widget="radio" attrs="{'invisible': [('requires_allocation', '=', 'no')]}"/>
                             <field name="allocation_validation_type" string="Approval" widget="radio" attrs="{'invisible': ['|', ('requires_allocation', '=', 'no'), ('employee_requests', '=', 'no')]}"/>
                         </group>
                     </group>
-                    <group>
-                        <group id="payroll">
-                        </group>
-                    </group>
                     <group name="visual" id="visual" >
-                        <group colspan="4">
-                            <h2>Display Option</h2>
+                        <group colspan="2" string="Display Option">
                         </group>
-                        <group colspan="4">
+                        <group colspan="2">
                             <field name="color" widget="color_picker" />
                             <field class="d-flex flex-wrap" name="icon_id" widget="hr_holidays_radio_image" options="{'horizontal': true}"/>
                         </group>
diff --git a/addons/hr_work_entry_holidays/views/hr_leave_views.xml b/addons/hr_work_entry_holidays/views/hr_leave_views.xml
index d8a65482684..828e9fb0867 100644
--- a/addons/hr_work_entry_holidays/views/hr_leave_views.xml
+++ b/addons/hr_work_entry_holidays/views/hr_leave_views.xml
@@ -6,9 +6,12 @@
         <field name="model">hr.leave.type</field>
         <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@id='payroll']" position="inside">
-                <h2>Payroll</h2>
-                <field name="work_entry_type_id"/>
+            <xpath expr="//group[@name='visual']" position="before">
+                <group>
+                    <group name="payroll" string="Payroll">
+                        <field name="work_entry_type_id"/>
+                    </group>
+                </group>
             </xpath>
         </field>
     </record>