diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py index 9b251b956e6..7e6af4e4858 100644 --- a/addons/hr/models/hr_employee.py +++ b/addons/hr/models/hr_employee.py @@ -33,6 +33,8 @@ class HrEmployeePrivate(models.Model): user_partner_id = fields.Many2one(related='user_id.partner_id', related_sudo=False, string="User's partner") active = fields.Boolean('Active', related='resource_id.active', default=True, store=True, readonly=False) company_id = fields.Many2one('res.company',required=True) + company_country_id = fields.Many2one('res.country', 'Company Country', related='company_id.country_id', readonly=True) + company_country_code = fields.Char(related='company_country_id.code', readonly=True) # private partner address_home_id = fields.Many2one( 'res.partner', 'Address', help='Enter here the private address of the employee, not the one linked to your company.', diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml index d8b1d12c705..b8be2d4ee51 100644 --- a/addons/hr/views/hr_employee_views.xml +++ b/addons/hr/views/hr_employee_views.xml @@ -90,6 +90,8 @@ + + diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py index 753484d403b..b4fa362ac11 100644 --- a/addons/hr_contract/models/hr_contract.py +++ b/addons/hr_contract/models/hr_contract.py @@ -44,6 +44,7 @@ class Contract(models.Model): company_id = fields.Many2one('res.company', compute='_compute_employee_contract', store=True, readonly=False, default=lambda self: self.env.company, required=True) company_country_id = fields.Many2one('res.country', string="Company country", related='company_id.country_id', readonly=True) + country_code = fields.Char(related='company_country_id.code', readonly=True) contract_type_id = fields.Many2one('hr.contract.type', "Contract Type") """ diff --git a/addons/hr_contract/report/hr_contract_history.py b/addons/hr_contract/report/hr_contract_history.py index 043967f8204..0e8cb44ed39 100644 --- a/addons/hr_contract/report/hr_contract_history.py +++ b/addons/hr_contract/report/hr_contract_history.py @@ -36,6 +36,8 @@ class ContractHistory(models.Model): resource_calendar_id = fields.Many2one('resource.calendar', readonly=True) wage = fields.Monetary('Wage', help="Employee's monthly gross wage.", readonly=True) company_id = fields.Many2one('res.company', string='Company', readonly=True) + company_country_id = fields.Many2one('res.country', string="Company country", related='company_id.country_id', readonly=True) + country_code = fields.Char(related='company_country_id.code', readonly=True) currency_id = fields.Many2one(string='Currency', related='company_id.currency_id', readonly=True) contract_type_id = fields.Many2one('hr.contract.type', 'Contract Type', readonly=True) contract_ids = fields.One2many('hr.contract', string='Contracts', compute='_compute_contract_ids', readonly=True) diff --git a/addons/hr_contract/report/hr_contract_history_report_views.xml b/addons/hr_contract/report/hr_contract_history_report_views.xml index 2c1d65a3670..75d8aed98d7 100644 --- a/addons/hr_contract/report/hr_contract_history_report_views.xml +++ b/addons/hr_contract/report/hr_contract_history_report_views.xml @@ -57,6 +57,8 @@ + + diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index 6f415a48e53..cedfcc96d58 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -152,6 +152,7 @@ +