From 13c575afde1eea71a604bc0756ba2c963056ce95 Mon Sep 17 00:00:00 2001 From: Dossogne Bertrand Date: Wed, 7 Dec 2022 08:21:48 +0000 Subject: [PATCH] [IMP] hr{|_hourly_cost}: move employee currency field This commit moves the currency_id field on the employee model from hr_hourly_cost to hr in order for it to be used in payroll localisations. task-3029348 closes odoo/odoo#113992 X-original-commit: 60599b735568c1873fdfde85e667b05347432382 Related: odoo/enterprise#37661 Signed-off-by: Yannick Tivisse (yti) --- addons/hr/models/hr_employee.py | 1 + addons/hr_hourly_cost/models/hr_employee.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py index b22e8343d64..a851e18d937 100644 --- a/addons/hr/models/hr_employee.py +++ b/addons/hr/models/hr_employee.py @@ -122,6 +122,7 @@ class HrEmployeePrivate(models.Model): id_card = fields.Binary(string="ID Card Copy", groups="hr.group_hr_user") driving_license = fields.Binary(string="Driving License", groups="hr.group_hr_user") private_car_plate = fields.Char(groups="hr.group_hr_user", help="If you have more than one car, just separate the plates by a space.") + currency_id = fields.Many2one('res.currency', related='company_id.currency_id', readonly=True) _sql_constraints = [ ('barcode_uniq', 'unique (barcode)', "The Badge ID must be unique, this one is already assigned to another employee."), diff --git a/addons/hr_hourly_cost/models/hr_employee.py b/addons/hr_hourly_cost/models/hr_employee.py index c23c87a7f60..ac29965feaa 100644 --- a/addons/hr_hourly_cost/models/hr_employee.py +++ b/addons/hr_hourly_cost/models/hr_employee.py @@ -7,5 +7,4 @@ class HrEmployee(models.Model): _inherit = 'hr.employee' hourly_cost = fields.Monetary('Hourly Cost', currency_field='currency_id', - groups="hr.group_hr_user", default=0.0) - currency_id = fields.Many2one('res.currency', related='company_id.currency_id', readonly=True) + groups="hr.group_hr_user", default=0.0)