From b328f0b09f5bfdbdfe6b22d8397dba990e0a136a Mon Sep 17 00:00:00 2001
From: Philippe Wauthy <phwa@odoo.com>
Date: Wed, 9 Mar 2022 10:32:02 +0000
Subject: [PATCH] [FIX] hr: fix employee ux

After installing l10n_be_hr_payroll, the address, email, phone and bank account number take half of the dedicated space.

This commit makes the fields take the dedicated space

task-2790206

closes odoo/odoo#86098

Related: odoo/enterprise#25126
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 addons/hr/models/hr_employee.py       |  2 +-
 addons/hr/views/hr_employee_views.xml | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 9a299359c70..fd7c16d7c0f 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -66,7 +66,7 @@ class HrEmployeePrivate(models.Model):
     ], string='Marital Status', groups="hr.group_hr_user", default='single', tracking=True)
     spouse_complete_name = fields.Char(string="Spouse Complete Name", groups="hr.group_hr_user", tracking=True)
     spouse_birthdate = fields.Date(string="Spouse Birthdate", groups="hr.group_hr_user", tracking=True)
-    children = fields.Integer(string='Number of Dependant Children', groups="hr.group_hr_user", tracking=True)
+    children = fields.Integer(string='Number of Dependent Children', groups="hr.group_hr_user", tracking=True)
     place_of_birth = fields.Char('Place of Birth', groups="hr.group_hr_user", tracking=True)
     country_of_birth = fields.Many2one('res.country', string="Country of Birth", groups="hr.group_hr_user", tracking=True)
     birthday = fields.Date('Date of Birth', groups="hr.group_hr_user", tracking=True)
diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index c0f2983f1bc..a82a753945b 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -118,7 +118,7 @@
                             <page name="personal_information" string="Private Information" groups="hr.group_hr_user">
                                 <group>
                                     <group string="Private Contact">
-                                        <group>
+                                        <group colspan="2">
                                             <field name="address_home_id"
                                                 context="{
                                                     'show_address': 1,
@@ -139,11 +139,15 @@
                                         </group>
                                     </group>
                                     <group>
-                                        <group string="Family Status" colspan="2">
-                                            <field name="marital"/>
-                                            <field name="spouse_complete_name" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}" groups="hr.group_hr_user"/>
-                                            <field name="spouse_birthdate" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}" groups="hr.group_hr_user"/>
-                                            <field name="children"/>
+                                        <group name="family_status" string="Family Status" colspan="2">
+                                            <group colspan="2">
+                                                <field name="marital"/>
+                                                <field name="spouse_complete_name" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}" groups="hr.group_hr_user"/>
+                                                <field name="spouse_birthdate" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}" groups="hr.group_hr_user"/>
+                                            </group>
+                                            <group name="children" col="4" colspan="2">
+                                                <field name="children"/>
+                                            </group>
                                         </group>
                                         <group string="Emergency" colspan="2">
                                             <field name="emergency_contact"/>