[IMP] base,*: Reorganize access rights groups

Purpose
=======

Access group terminology is missleading. Yous have to be manager to administrate
an application. This task consists to rename groups to be understandable for everyone.

Groups should be reorganised on the users form to be more explicit.

Specification
=============

1/ Rename 'Manager' to 'Administrator' in users groups.
2/ Define a hierarchy on access groups by using the category_id in the manifests
   A category 'Operations/Project' will create a category Project with a parent
   category 'Operations', and something smart is already developed (in modules/db.py)
   to avoid duplicating categories.
3/ Add a group in expenses to be able to approve expenses reports for my team.
4/ Add a group in timesheets to be able to approve timesheets for my team.
5/ Remove partially the useless crap in ir_module_category_data.xml
6/ Sort access rights groups on users form according to its parent category

closes odoo/odoo#29362

Signed-off-by: "Yannick Tivisse (yti)" <yti@odoo.com>

4 files changed, 22 insertions, 18 deletions

diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index 50f3d79f826..cc325726348 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Time Off',
     'version': '1.5',
-    'category': 'Human Resources',
+    'category': 'Human Resources/Time Off',
     'summary': 'Allocate time off and follow time off requests',
     'website': 'https://www.odoo.com/page/leaves',
     'description': """
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index be18aaa71d6..dc5932a1145 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -530,7 +530,7 @@ class HolidaysRequest(models.Model):
                 return
             current_employee = self.env['hr.employee'].sudo().search([('user_id', '=', self.env.uid)], limit=1)
             for record in self:
-                emp_id = (record._cache.get('employee_id', [False]) or [False])[0]
+                emp_id = record._cache.get('employee_id', [False])[0]
                 if emp_id != current_employee.id:
                     try:
                         record._cache['name']
diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml
index df7317fa5d2..6e893f62d85 100644
--- a/addons/hr_holidays/security/hr_holidays_security.xml
+++ b/addons/hr_holidays/security/hr_holidays_security.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <record model="ir.module.category" id="base.module_category_human_resources_time_off">
+        <field name="description">Helps you manage your time off.</field>
+        <field name="sequence">10</field>
+    </record>
 
     <record id="group_hr_holidays_team_leader" model="res.groups">
-        <field name="name">Team Leader</field>
-        <field name="category_id" ref="base.module_category_hr_holidays"/>      
+        <field name="name">Team Approver</field>
+        <field name="category_id" ref="base.module_category_human_resources_time_off"/>      
     </record> 
 
     <record id="group_hr_holidays_user" model="res.groups">
-        <field name="name">Officer</field>
-        <field name="category_id" ref="base.module_category_hr_holidays"/>
+        <field name="name">All Approver</field>
+        <field name="category_id" ref="base.module_category_human_resources_time_off"/>
         <field name="implied_ids" eval="[(4, ref('hr.group_hr_user')), (4, ref('group_hr_holidays_team_leader'))]"/>
     </record>
 
     <record id="group_hr_holidays_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_hr_holidays"/>
+        <field name="name">Administrator</field>
+        <field name="category_id" ref="base.module_category_human_resources_time_off"/>
         <field name="implied_ids" eval="[(4, ref('hr_holidays.group_hr_holidays_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
     </record>
@@ -42,7 +46,7 @@
     </record>
 
     <record id="hr_leave_rule_team_leader_update" model="ir.rule">
-        <field name="name">Time Off: Team Leader: write on employee's time off in his team</field>
+        <field name="name">Time Off: approver: write on employee's time off in his team</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">[('employee_id.leave_manager_id', '=' , user.id)]</field>
         <field name="perm_read" eval="False"/>
@@ -52,7 +56,7 @@
     </record>
 
     <record id="hr_leave_rule_officer_read" model="ir.rule">
-        <field name="name">Time Off: officer: read all</field>
+        <field name="name">Time Off: see all time off: read all</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">[(1, '=', 1)]</field>
         <field name="perm_create" eval="False"/>
@@ -62,7 +66,7 @@
     </record>
 
     <record id="hr_leave_rule_officer_update" model="ir.rule">
-        <field name="name">Time Off: officer: create/write/unlink own + managed employee + without department + same or managed department</field>
+        <field name="name">Time Off: see all time off: create/write/unlink own + managed employee + without department + same or managed department</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">['|',
 '|', ('employee_id.user_id', '=', user.id), ('employee_id.parent_id.user_id', '=', user.id),
@@ -72,7 +76,7 @@
     </record>
 
     <record id="hr_leave_rule_manager" model="ir.rule">
-        <field name="name">Time Off: manager: no limit</field>
+        <field name="name">Time Off: administrator: no limit</field>
         <field name="model_id" ref="model_hr_leave"/>
         <field name="domain_force">[(1, '=', 1)]</field>
         <field name="groups" eval="[(4, ref('group_hr_holidays_manager'))]"/>
@@ -104,7 +108,7 @@
     </record>
 
     <record id="hr_leave_allocation_rule_officer_read" model="ir.rule">
-        <field name="name">Allocations: officer: read all</field>
+        <field name="name">Allocations: see all time off: read all</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
         <field name="domain_force">[(1, '=', 1)]</field>
         <field name="perm_create" eval="False"/>
@@ -114,7 +118,7 @@
     </record>
 
     <record id="hr_leave_allocation_rule_officer_update" model="ir.rule">
-        <field name="name">Allocations: officer: create/write/unlink own + managed employee + without department + same or managed department</field>
+        <field name="name">Allocations: see all time off: create/write/unlink own + managed employee + without department + same or managed department</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
         <field name="domain_force">['|',
 '|', ('employee_id.user_id', '=', user.id), ('employee_id.parent_id.user_id', '=', user.id),
@@ -123,14 +127,14 @@
     </record>
 
     <record id="hr_leave_allocation_rule_manager" model="ir.rule">
-        <field name="name">Allocations: manager: no limit</field>
+        <field name="name">Allocations: administrator: no limit</field>
         <field name="model_id" ref="model_hr_leave_allocation"/>
         <field name="domain_force">[(1, '=', 1)]</field>
         <field name="groups" eval="[(4, ref('group_hr_holidays_manager'))]"/>
     </record>
 
     <record id="resource_leaves_team_leader" model="ir.rule">
-        <field name="name">Time Off Resources: Team Leader</field>
+        <field name="name">Time Off Resources: Approver</field>
         <field name="model_id" ref="model_resource_calendar_leaves"/>
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4, ref('hr_holidays.group_hr_holidays_team_leader'))]"/>
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index f1e2865fd66..29165d1c53e 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -521,8 +521,8 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,kanban,form,calendar,activity</field>
         <field name="context">{
-            'search_default_managed_people': 1,
-            'search_default_my_team_leaves': 1
+            'search_default_managed_people':1,
+            'search_default_my_team_leaves':1,
             'search_default_approve':1}
         </field>
         <field name="domain">[]</field>