Skip to content

Commit

Permalink
[IMP] payroll: depends on base_time_parameter
Browse files Browse the repository at this point in the history
[FIX] payroll: rule_parameter
  • Loading branch information
norlinhenrik committed Oct 26, 2022
1 parent b1a02c5 commit 7db259f
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 153 deletions.
9 changes: 7 additions & 2 deletions payroll/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
"summary": "Manage your employee payroll records",
"license": "LGPL-3",
"author": "Odoo SA, Odoo Community Association (OCA)",
"depends": ["hr_contract", "hr_holidays", "mail"],
"depends": [
"base_time_parameter",
"hr_contract",
"hr_holidays",
"mail",
],
"data": [
"security/hr_payroll_security.xml",
"security/ir.model.access.csv",
Expand All @@ -18,6 +23,7 @@
"wizard/hr_payroll_contribution_register_report_views.xml",
"wizard/hr_payroll_payslips_by_employees_views.xml",
"views/menus.xml",
"views/base_time_parameter_views.xml",
"views/hr_contract_views.xml",
"views/hr_payroll_structure_views.xml",
"views/hr_salary_rule_category_views.xml",
Expand All @@ -27,7 +33,6 @@
"views/hr_payslip_views.xml",
"views/hr_payslip_run_views.xml",
"views/hr_employee_views.xml",
"views/hr_rule_parameter_views.xml",
"views/report_contributionregister.xml",
"views/report_payslip.xml",
"views/report_payslipdetails.xml",
Expand Down
1 change: 0 additions & 1 deletion payroll/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@
from . import hr_payslip_worked_days
from . import hr_payslip_run
from . import res_config_settings
from . import hr_rule_parameter
4 changes: 2 additions & 2 deletions payroll/models/base_browsable.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ def sum(self, code, from_date, to_date=None):
return res and res[0] or 0.0

def rule_parameter(self, code):
return self.env["hr.rule.parameter"]._get_parameter_from_code(
code, self.dict.date_to
return self.env["base.time.parameter"]._get_value_from_model_code_date(
"hr.payslip", code, self.dict.date_to
)
74 changes: 0 additions & 74 deletions payroll/models/hr_rule_parameter.py

This file was deleted.

8 changes: 4 additions & 4 deletions payroll/security/ir.model.access.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ access_hr_rule_input_officer,hr.rule.input.office,model_hr_rule_input,payroll.gr
access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,payroll.group_payroll_user,1,1,1,1
access_hr_payslip_batch_employees_transient,hr.payslip.employees.batch,model_hr_payslip_employees,hr.group_hr_user,1,1,1,0
access_hr_payslip_lines_contribution_register_transient,payslip.lines.contribution.register,model_payslip_lines_contribution_register,hr.group_hr_user,1,1,1,0
access_hr_rule_parameter_manager,access_hr_rule_parameter_manager,model_hr_rule_parameter,payroll.group_payroll_manager,1,1,1,1
access_hr_rule_parameter_user,access_hr_rule_parameter_user,model_hr_rule_parameter,hr.group_hr_user,1,0,0,0
access_hr_rule_parameter_value_manager,access_hr_rule_parameter_value_manager,model_hr_rule_parameter_value,payroll.group_payroll_manager,1,1,1,1
access_hr_rule_parameter_value_user,access_hr_rule_parameter_value_user,model_hr_rule_parameter_value,hr.group_hr_user,1,0,0,0
access_base_time_parameter_manager,access_base_time_parameter_manager,base_time_parameter.model_base_time_parameter,payroll.group_payroll_manager,1,1,1,1
access_base_time_parameter_user,access_base_time_parameter_user,base_time_parameter.model_base_time_parameter,hr.group_hr_user,1,0,0,0
access_base_time_parameter_value_manager,access_base_time_parameter_value_manager,base_time_parameter.model_base_time_parameter_value,payroll.group_payroll_manager,1,1,1,1
access_base_time_parameter_value_user,access_base_time_parameter_value_user,base_time_parameter.model_base_time_parameter_value,hr.group_hr_user,1,0,0,0
access_hr_payslip_change_state,access_hr_payslip_change_state,model_hr_payslip_change_state,base.group_user,1,1,1,0
10 changes: 10 additions & 0 deletions payroll/views/base_time_parameter_views.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<menuitem
id="menu_action_base_time_parameter"
action="base_time_parameter.base_time_parameter_action"
name="Time Parameters"
parent="payroll_menu_configuration"
sequence="35"
/>
</odoo>
70 changes: 0 additions & 70 deletions payroll/views/hr_rule_parameter_views.xml

This file was deleted.

0 comments on commit 7db259f

Please sign in to comment.