diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml index cd9b4056e95..3d2e6166a12 100644 --- a/addons/hr/views/hr_employee_views.xml +++ b/addons/hr/views/hr_employee_views.xml @@ -30,6 +30,7 @@ + diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index 95e30850034..f0e16ea1cf8 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -262,6 +262,7 @@ + @@ -1101,6 +1102,7 @@ + diff --git a/addons/hr_recruitment_skills/models/hr_applicant.py b/addons/hr_recruitment_skills/models/hr_applicant.py index 84a36bae4de..3951a738a24 100644 --- a/addons/hr_recruitment_skills/models/hr_applicant.py +++ b/addons/hr_recruitment_skills/models/hr_applicant.py @@ -1,13 +1,19 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import fields, models +from odoo import fields, models, api class HrApplicant(models.Model): _inherit = 'hr.applicant' applicant_skill_ids = fields.One2many('hr.applicant.skill', 'applicant_id', string="Skills") + skill_ids = fields.Many2many('hr.skill', compute='_compute_skill_ids', store=True) + + @api.depends('applicant_skill_ids.skill_id') + def _compute_skill_ids(self): + for applicant in self: + applicant.skill_ids = applicant.applicant_skill_ids.skill_id def create_employee_from_applicant(self): self.ensure_one() diff --git a/addons/hr_recruitment_skills/views/hr_applicant_views.xml b/addons/hr_recruitment_skills/views/hr_applicant_views.xml index b308e82167c..d38d03422ca 100644 --- a/addons/hr_recruitment_skills/views/hr_applicant_views.xml +++ b/addons/hr_recruitment_skills/views/hr_applicant_views.xml @@ -33,6 +33,9 @@ + + + @@ -44,6 +47,9 @@ + + + diff --git a/addons/hr_skills/models/hr_employee.py b/addons/hr_skills/models/hr_employee.py index 7258e821566..2aa0f6cfd04 100644 --- a/addons/hr_skills/models/hr_employee.py +++ b/addons/hr_skills/models/hr_employee.py @@ -9,6 +9,12 @@ class Employee(models.Model): resume_line_ids = fields.One2many('hr.resume.line', 'employee_id', string="Resumé lines") employee_skill_ids = fields.One2many('hr.employee.skill', 'employee_id', string="Skills") + skill_ids = fields.Many2many('hr.skill', compute='_compute_skill_ids', store=True) + + @api.depends('employee_skill_ids.skill_id') + def _compute_skill_ids(self): + for employee in self: + employee.skill_ids = employee.employee_skill_ids.skill_id @api.model_create_multi def create(self, vals_list): diff --git a/addons/hr_skills/views/hr_views.xml b/addons/hr_skills/views/hr_views.xml index 3614e9af29e..9827b198820 100644 --- a/addons/hr_skills/views/hr_views.xml +++ b/addons/hr_skills/views/hr_views.xml @@ -10,6 +10,9 @@ + + +