[FIX] hr_timesheet: merge hr_timesheet Officer and Manager access right

There's no real difference between the 2 access rights

6 files changed, 6 insertions, 12 deletions

diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 9f61b125fb3..d4e8bd4c780 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -40,7 +40,7 @@
 
 
         <menuitem id="menu_timesheets_reports" name="Reports"
-            parent="timesheet_menu_root" sequence="99" groups="hr_timesheet.group_hr_timesheet_manager"/>
+            parent="timesheet_menu_root" sequence="99" groups="hr_timesheet.group_hr_timesheet_user"/>
         <menuitem id="menu_hr_activity_analysis" parent="menu_timesheets_reports" action="act_hr_timesheet_report"
             name="Activity Analysis"/>
     </data>
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index eca4cef48ad..1a95247cf0b 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -4,16 +4,10 @@
         <field name="name">Officer</field>
         <field name="category_id" ref="base.module_category_hr_timesheet"/>
         <field name="implied_ids" eval="[(4, ref('hr.group_hr_user'))]"/>
-    </record>
-
-    <record id="group_hr_timesheet_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_hr_timesheet"/>
-        <field name="implied_ids" eval="[(4, ref('hr_timesheet.group_hr_timesheet_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="base.default_user" model="res.users">
-        <field name="groups_id" eval="[(4,ref('hr_timesheet.group_hr_timesheet_manager'))]"/>
+        <field name="groups_id" eval="[(4,ref('hr_timesheet.group_hr_timesheet_user'))]"/>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/addons/hr_timesheet/test/hr_timesheet_users.yml b/addons/hr_timesheet/test/hr_timesheet_users.yml
index 44a88407aa9..0baa9062f89 100644
--- a/addons/hr_timesheet/test/hr_timesheet_users.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_users.yml
@@ -10,7 +10,7 @@
 -
   !record {model: res.users, id: res_hr_timesheet_manager}:
     groups_id:
-      - hr_timesheet.group_hr_timesheet_manager
+      - hr_timesheet.group_hr_timesheet_user
 -
   Create a user as 'HR timesheet Officer'
 -
diff --git a/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index e7d84f42131..e8d5a3c3019 100644
--- a/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -6,7 +6,7 @@
     name: HR Manager
     login: hr
     groups_id:
-      - hr_timesheet.group_hr_timesheet_manager
+      - hr_timesheet.group_hr_timesheet_user
 -
   Create a product with type service used to specify employees designation
 -
diff --git a/addons/hr_timesheet_attendance/security/ir.model.access.csv b/addons/hr_timesheet_attendance/security/ir.model.access.csv
index e4f572ba611..5ae999d3a4a 100644
--- a/addons/hr_timesheet_attendance/security/ir.model.access.csv
+++ b/addons/hr_timesheet_attendance/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,hr_timesheet.group_hr_timesheet_user,1,1,1,1
 access_hr_timesheet_sheet_sheet_day_user,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
-access_hr_timesheet_attendance_report,access_hr_timesheet_attendance_report,model_hr_timesheet_attendance_report,hr_timesheet.group_hr_timesheet_manager,1,0,0,0
+access_hr_timesheet_attendance_report,access_hr_timesheet_attendance_report,model_hr_timesheet_attendance_report,hr_timesheet.group_hr_timesheet_user,1,0,0,0
diff --git a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
index e16ab373229..4b39351560a 100644
--- a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
@@ -238,7 +238,7 @@
                         type="action"
                         class="oe_stat_button"
                         icon="fa-clock-o"
-                        groups="hr_timesheet.group_hr_timesheet_manager">
+                        groups="hr_timesheet.group_hr_timesheet_user">
                         <field name="timesheet_count" widget="statinfo" string="Timesheets"/>
                     </button>
                 </div>