diff --git a/payroll_contract_advantages/models/hr_contract_advantage.py b/payroll_contract_advantages/models/hr_contract_advantage.py index efeff1768..0df2302b1 100644 --- a/payroll_contract_advantages/models/hr_contract_advantage.py +++ b/payroll_contract_advantages/models/hr_contract_advantage.py @@ -15,13 +15,16 @@ class HrContractAdvantage(models.Model): advantage_template_code = fields.Char( string="Code", related="advantage_template_id.code", readonly=True ) - advantage_lower_bound = fields.Float( + currency_id = fields.Many2one( + related="contract_id.currency_id", store=True, readonly=True + ) + advantage_lower_bound = fields.Monetary( string="Lower Bound", related="advantage_template_id.lower_bound", readonly=True ) - advantage_upper_bound = fields.Float( + advantage_upper_bound = fields.Monetary( string="Upper Bound", related="advantage_template_id.upper_bound", readonly=True ) - amount = fields.Float(string="Amount") + amount = fields.Monetary(currency_field="currency_id") @api.onchange("advantage_template_id") def _onchange_advantage_template_id(self): diff --git a/payroll_contract_advantages/models/hr_contract_advantage_template.py b/payroll_contract_advantages/models/hr_contract_advantage_template.py index 099f1680b..c3e6eaa2c 100644 --- a/payroll_contract_advantages/models/hr_contract_advantage_template.py +++ b/payroll_contract_advantages/models/hr_contract_advantage_template.py @@ -7,12 +7,21 @@ 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" + name = fields.Char(required=True) + code = fields.Char(required=True) + active = fields.Boolean(default=True) + currency_id = fields.Many2one( + "res.currency", + required=True, + default=lambda self: self.env.company.currency_id, ) - upper_bound = fields.Float( - "Upper Bound", help="Upper bound authorized by the employer for this advantage" + + lower_bound = fields.Monetary( + currency_field="currency_id", + help="Lower bound authorized by the employer for this advantage", + ) + upper_bound = fields.Monetary( + currency_field="currency_id", + help="Upper bound authorized by the employer for this advantage", ) - default_value = fields.Float("Default value for this advantage") + default_value = fields.Monetary(currency_field="currency_id") diff --git a/payroll_contract_advantages/views/hr_contract_advantage_views.xml b/payroll_contract_advantages/views/hr_contract_advantage_views.xml index 1b088eea7..5d0215691 100644 --- a/payroll_contract_advantages/views/hr_contract_advantage_views.xml +++ b/payroll_contract_advantages/views/hr_contract_advantage_views.xml @@ -6,6 +6,12 @@
+

@@ -14,6 +20,7 @@ + @@ -21,6 +28,7 @@ + diff --git a/payroll_contract_advantages/views/hr_contract_views.xml b/payroll_contract_advantages/views/hr_contract_views.xml index 0792831bf..091a583ac 100644 --- a/payroll_contract_advantages/views/hr_contract_views.xml +++ b/payroll_contract_advantages/views/hr_contract_views.xml @@ -17,6 +17,7 @@ +