diff --git a/addons/hr_payroll/models/hr_contract.py b/addons/hr_payroll/models/hr_contract.py index 278f2537412..92131667af3 100644 --- a/addons/hr_payroll/models/hr_contract.py +++ b/addons/hr_payroll/models/hr_contract.py @@ -29,27 +29,3 @@ class HrContract(models.Model): """ structures = self.mapped('struct_id') return structures._get_parent_structure() if structures else self.env['hr.payroll.structure'] - - @api.multi - def get_attribute(self, code, attribute): - return self.env['hr.contract.advantage.template'].search([('code', '=', code)], limit=1)[attribute] - - @api.multi - def set_attribute_value(self, code, active): - for contract in self: - if active: - value = self.env['hr.contract.advantage.template'].search([('code', '=', code)], limit=1).default_value - contract[code] = value - else: - contract[code] = 0.0 - - -class HrContractAdvandageTemplate(models.Model): - _name = 'hr.contract.advantage.template' - _description = "Employee's Advantage on Contract" - - name = fields.Char('Name', required=True) - code = fields.Char('Code', required=True) - lower_bound = fields.Float('Lower Bound', help="Lower bound authorized by the employer for this advantage") - upper_bound = fields.Float('Upper Bound', help="Upper bound authorized by the employer for this advantage") - default_value = fields.Float('Default value for this advantage') diff --git a/addons/hr_payroll/models/hr_payslip.py b/addons/hr_payroll/models/hr_payslip.py index 5a990a4f99b..d902987c3e2 100644 --- a/addons/hr_payroll/models/hr_payslip.py +++ b/addons/hr_payroll/models/hr_payslip.py @@ -10,6 +10,7 @@ from odoo import api, fields, models, tools, _ from odoo.addons import decimal_precision as dp from odoo.addons.hr_payroll.models.browsable_object import BrowsableObject, InputLine, WorkedDays, Payslips from odoo.exceptions import UserError, ValidationError +from odoo.tools import float_round class HrPayslip(models.Model): @@ -174,6 +175,10 @@ class HrPayslip(models.Model): return res + def _get_base_local_dict(self): + return { + 'float_round': float_round + } # YTI TODO: pass recordset as argument @api.model @@ -204,7 +209,7 @@ class HrPayslip(models.Model): payslips = Payslips(self.employee_id.id, self, self.env) rules = BrowsableObject(self.employee_id.id, rules_dict, self.env) - baselocaldict = {'categories': categories, 'rules': rules, 'payslip': payslips, 'worked_days': worked_days, 'inputs': inputs} + baselocaldict = {**self._get_base_local_dict(), **{'categories': categories, 'rules': rules, 'payslip': payslips, 'worked_days': worked_days, 'inputs': inputs}} #get the ids of the structures on the contracts and their parent id as well if len(contracts) == 1 and self.struct_id: structures = self.struct_id._get_parent_structure() diff --git a/addons/hr_payroll/models/res_config_settings.py b/addons/hr_payroll/models/res_config_settings.py index 7653675c378..f02a9830d5b 100644 --- a/addons/hr_payroll/models/res_config_settings.py +++ b/addons/hr_payroll/models/res_config_settings.py @@ -7,7 +7,7 @@ from odoo import fields, models class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' - module_account_accountant = fields.Boolean(string='Account Accountant') module_l10n_fr_hr_payroll = fields.Boolean(string='French Payroll') module_l10n_be_hr_payroll = fields.Boolean(string='Belgium Payroll') module_l10n_in_hr_payroll = fields.Boolean(string='Indian Payroll') + module_hr_payroll_account = fields.Boolean(string='Payroll with Accounting') diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index 484551f5cc4..d1a03b160a5 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -9,7 +9,5 @@ access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,hr_pay access_hr_payslip_worked_days_officer,hr.payslip.worked_days.officer,model_hr_payslip_worked_days,hr_payroll.group_hr_payroll_user,1,1,1,1 access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,hr_payroll.group_hr_payroll_manager,1,1,1,1 access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,hr_payroll.group_hr_payroll_user,1,1,1,1 -access_hr_contract_advantage_template,hr.contract.advantage.template.user,model_hr_contract_advantage_template,hr_payroll.group_hr_payroll_user,1,1,1,1 -access_hr_contract_advantage_template_hr_user,hr.contract.advantage.template.hr.user,model_hr_contract_advantage_template,hr.group_hr_user,1,0,0,0 access_hr_benefit,access_hr_benefit,model_hr_benefit,group_hr_payroll_user,1,1,1,1 -access_hr_benefit_type,access_hr_benefit_type,model_hr_benefit_type,group_hr_payroll_user,1,1,1,1 \ No newline at end of file +access_hr_benefit_type,access_hr_benefit_type,model_hr_benefit_type,group_hr_payroll_user,1,1,1,1 diff --git a/addons/hr_payroll/views/hr_contract_views.xml b/addons/hr_payroll/views/hr_contract_views.xml index 71acff3c13a..6a377e16744 100644 --- a/addons/hr_payroll/views/hr_contract_views.xml +++ b/addons/hr_payroll/views/hr_contract_views.xml @@ -24,58 +24,4 @@ - - - hr.contract.advantage.template.form - hr.contract.advantage.template - -
- -
-

- -

-
- - - - - - - - - - - - - -
- - - - - hr.contract.advantage.template.tree - hr.contract.advantage.template - - - - - - - - - - - - - Contract Advantage Templates - hr.contract.advantage.template - form - - - \ No newline at end of file diff --git a/addons/hr_payroll/views/res_config_settings_views.xml b/addons/hr_payroll/views/res_config_settings_views.xml index 42d5e608d05..c16ee946734 100644 --- a/addons/hr_payroll/views/res_config_settings_views.xml +++ b/addons/hr_payroll/views/res_config_settings_views.xml @@ -4,7 +4,7 @@ Payroll ir.module.module kanban,tree,form - + @@ -37,10 +37,10 @@
- +
-