From 605a3c1e44bcdf274bd6b1a82f34c02c83dad11f Mon Sep 17 00:00:00 2001 From: Dossogne Bertrand Date: Tue, 22 Mar 2022 11:18:23 +0000 Subject: [PATCH] [IMP] hr_*: uniformize group category *: approvals hr_apprasaisal hr_payroll hr_referral fleet hr hr_attendance hr_holidays hr_recruitment lunch Change various access rights names to improve understandability for users. Addition of an officer role in fleet with intermediate accesses TaskID 2742855 closes odoo/odoo#87545 Related: odoo/enterprise#25741 Signed-off-by: Kevin Baptiste --- addons/fleet/security/fleet_security.xml | 10 +++++----- addons/fleet/views/fleet_board_view.xml | 2 +- addons/hr/security/hr_security.xml | 3 +-- .../hr_attendance/security/hr_attendance_security.xml | 7 +++---- addons/hr_contract/security/security.xml | 2 +- addons/hr_holidays/security/hr_holidays_security.xml | 4 ++-- .../security/hr_recruitment_security.xml | 4 ++-- addons/lunch/security/lunch_security.xml | 2 +- odoo/addons/base/data/ir_module_category_data.xml | 2 +- odoo/addons/base/models/res_users.py | 5 ++++- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml index 9edad23b81a..f83cef6652f 100644 --- a/addons/fleet/security/fleet_security.xml +++ b/addons/fleet/security/fleet_security.xml @@ -5,7 +5,7 @@ 17 - User + Officer : Manage all vehicles @@ -63,22 +63,22 @@ Administrator has all rights on vehicle's contracts - + Administrator has all rights on vehicle's services - + Administrator has all rights on vehicle's vehicle's odometer - + Administrator has all rights on vehicle - + Fleet vehicle: Multi Company diff --git a/addons/fleet/views/fleet_board_view.xml b/addons/fleet/views/fleet_board_view.xml index 880be866c42..95b4ab63c95 100644 --- a/addons/fleet/views/fleet_board_view.xml +++ b/addons/fleet/views/fleet_board_view.xml @@ -65,7 +65,7 @@ Costs Analysis fleet.vehicle.cost.report graph,pivot - + diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index aa646fb1df3..f080b19c512 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -2,12 +2,11 @@ - Helps you manage your employees. 9 - Officer + Officer : Manage all employees The user will be able to approve document created by employees. diff --git a/addons/hr_attendance/security/hr_attendance_security.xml b/addons/hr_attendance/security/hr_attendance_security.xml index 44f244502bc..2e66e1ef257 100644 --- a/addons/hr_attendance/security/hr_attendance_security.xml +++ b/addons/hr_attendance/security/hr_attendance_security.xml @@ -1,12 +1,11 @@ - Helps you manage the attendances. 14 - Kiosk Attendance + User : Only kiosk mode The user will be able to open the kiosk mode and validate the employee PIN. @@ -17,13 +16,13 @@ - Manual Attendance + User The user will gain access to the human resources attendance menu, enabling him to manage his own attendance. - Officer + Officer : Manage all attendances diff --git a/addons/hr_contract/security/security.xml b/addons/hr_contract/security/security.xml index 96a6d1ee753..3bbc0ae6a48 100644 --- a/addons/hr_contract/security/security.xml +++ b/addons/hr_contract/security/security.xml @@ -2,7 +2,7 @@ - Helps you manage your contracts. + Enable the user to see and manage the contracts from Employee application. 10 diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index 53b28632795..637d5c29b10 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -1,7 +1,7 @@ - Helps you manage your time off. + A user without any rights on Time Off will be able to see the application, create his own holidays and manage the requests of the users he's manager of. 10 @@ -12,7 +12,7 @@ - Time Off Officer + Officer : Manage all requests diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml index 2adffe2a731..1e14be0ae04 100644 --- a/addons/hr_recruitment/security/hr_recruitment_security.xml +++ b/addons/hr_recruitment/security/hr_recruitment_security.xml @@ -2,7 +2,7 @@ - Helps you manage your recruitments. + The user interacting with the application as interviewer don't need any specific access. They'll have access thanks to their interviewer assignation. 11 @@ -20,7 +20,7 @@ - Officer + Officer : Manage all applicants diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index cedbab1eccf..cff42f506a1 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -6,7 +6,7 @@ 16 - User + User : Order your meal diff --git a/odoo/addons/base/data/ir_module_category_data.xml b/odoo/addons/base/data/ir_module_category_data.xml index 13bbf15c64e..86af7f769f9 100644 --- a/odoo/addons/base/data/ir_module_category_data.xml +++ b/odoo/addons/base/data/ir_module_category_data.xml @@ -80,7 +80,7 @@ Appraisals - Helps you manage your appraisals. + A user without any rights on Appraisals will be able to see the application, create and manage appraisals for himself and the people he's manager of. 15 diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py index 252bed9f8b1..5baea2ab9e7 100644 --- a/odoo/addons/base/models/res_users.py +++ b/odoo/addons/base/models/res_users.py @@ -1556,7 +1556,10 @@ class UsersView(models.Model): if allfields and field_name not in allfields: continue # selection group field - tips = ['%s: %s' % (g.name, g.comment) for g in gs if g.comment] + tips = [] + if app.description: + tips.append(app.description + '\n') + tips.extend('%s: %s' % (g.name, g.comment) for g in gs if g.comment) res[field_name] = { 'type': 'selection', 'string': app.name or _('Other'),