Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3

This commit is contained in:
Bakry 2025-06-29 15:02:41 +03:00
commit 5aad3e7f48
3 changed files with 4 additions and 12 deletions

View File

@ -446,10 +446,7 @@
<menuitem id="menu_hr_payslip_run"
action="action_hr_payslip_run_tree"
parent="menu_hr_payroll_root"
groups=
"hr_base.group_executive_manager,
hr_base.group_general_manager,
exp_hr_payroll.group_hr_payroll_user"
groups="hr_base.group_executive_manager,hr_base.group_general_manager,exp_hr_payroll.group_hr_payroll_user"
/>
<!-- Shortcuts -->

View File

@ -49,12 +49,13 @@
<field name="model_id" ref="model_hr_payslip"/>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(4, ref('exp_payroll_custom.group_hr_payroll_contributor')),
(4, ref('hr.group_hr_user')),(4, ref('hr.group_hr_manager')),
(4, ref('hr_base.group_general_manager')),
(4, ref('exp_hr_payroll.group_hr_payroll_user')),
(4, ref('hr_base.group_executive_manager')),
]"/>
<!-- (4, ref('hr.group_hr_manager')),(4, ref('hr.group_hr_user')),-->
</record>
<record id="hr_payslip_rule_comp_rule" model="ir.rule">

View File

@ -128,13 +128,7 @@
<menuitem id="employee_reward_menu" name="Employee Reward and Allowances"
parent="exp_hr_payroll.menu_hr_payroll_root"
action="employee_reward_list_action" sequence="10"
groups=
"hr_base.group_executive_manager,
hr.group_hr_user,
hr_base.group_department_manager,
hr_base.group_division_manager,
hr_base.group_general_manager,
exp_hr_payroll.group_hr_payroll_user"/>
groups="hr_base.group_executive_manager,hr.group_hr_user,hr_base.group_department_manager,hr_base.group_division_manager,hr_base.group_general_manager,exp_hr_payroll.group_hr_payroll_user"/>
</data>
</odoo>