diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py index b470d2d7f557e..dc20f57822e22 100644 --- a/addons/hr/models/hr_employee.py +++ b/addons/hr/models/hr_employee.py @@ -495,8 +495,7 @@ def _compute_legal_name(self): @api.depends('current_version_id') @api.depends_context('version_id') def _compute_version_id(self): - context_version_id = self.env.context.get('version_id', False) - context_version = self.env['hr.version'].browse(context_version_id).exists() if context_version_id else self.env['hr.version'] + context_version = self.env['hr.version'].browse(self.env.context.get('version_id', False)) for employee in self: if context_version.employee_id == self: diff --git a/addons/hr/models/hr_version.py b/addons/hr/models/hr_version.py index dc0db8c913f95..93a658d9321d6 100644 --- a/addons/hr/models/hr_version.py +++ b/addons/hr/models/hr_version.py @@ -195,11 +195,6 @@ def _get_hr_responsible_domain(self): 'An employee cannot have multiple active versions sharing the same effective date.', ) - _check_wage_positive = models.Constraint( - 'CHECK(wage >= 0)', - 'The wage must be a positive value.', - ) - @api.depends('employee_id.company_id') def _compute_company_id(self): for version in self: diff --git a/addons/hr/tests/test_hr_version.py b/addons/hr/tests/test_hr_version.py index a2b8e3ab298c2..ab585bc77163f 100644 --- a/addons/hr/tests/test_hr_version.py +++ b/addons/hr/tests/test_hr_version.py @@ -520,27 +520,6 @@ def test_multi_edit_other_and_contract_date_sync(self): self.assertEqual(version.job_id.id, jobB.id) self.assertEqual(version.contract_date_end, date(2020, 9, 30)) - def test_delete_version(self): - employee = self.env['hr.employee'].create({ - 'name': 'John Doe', - 'date_version': '2020-01-01', - }) - v1 = employee.version_id - v2 = employee.create_version({ - 'date_version': '2021-01-01', - }) - v3 = employee.create_version({ - 'date_version': '2022-01-01', - }) - self.assertEqual(employee.current_version_id, v3) - - v3.unlink() - self.assertEqual(employee.current_version_id, v2) - v1.unlink() - self.assertEqual(employee.current_version_id, v2) - with self.assertRaises(ValidationError): - v2.unlink() - def test_multi_edit_multi_employees_no_contract(self): """ Test the multi-edit when there is one version per employee, without contract diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index dd65558ae9c06..f93d621cc8a73 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -272,14 +272,15 @@ def _search_max_leaves(self, operator, value): return [('id', 'in', valid_leaves)] def _search_virtual_remaining_leaves(self, operator, value): - def is_valid(leave_type): - return not leave_type.requires_allocation or op(leave_type.virtual_remaining_leaves, value) op = PY_OPERATORS.get(operator) if not op: return NotImplemented if operator != 'in': value = float(value) leave_types = self.env['hr.leave.type'].search([]) + + def is_valid(leave_type): + return not leave_type.requires_allocation or op(leave_type.virtual_remaining_leaves, value) return [('id', 'in', leave_types.filtered(is_valid).ids)] @api.depends_context('employee_id', 'default_employee_id', 'leave_date_from', 'default_date_from') diff --git a/addons/hr_holidays/tests/test_hr_leave_type.py b/addons/hr_holidays/tests/test_hr_leave_type.py index b7732013987c5..b13b589c53ad1 100644 --- a/addons/hr_holidays/tests/test_hr_leave_type.py +++ b/addons/hr_holidays/tests/test_hr_leave_type.py @@ -114,3 +114,27 @@ def test_users_tz_shift_back(self): ).search([('has_valid_allocation', '=', True)], limit=1) self.assertFalse(leave_types, "Got valid leaves outside vaild period") + + def test_search_virtual_remaining_leaves(self): + employee_id = self.env['hr.employee'].create({'name': 'Test Employee'}) + leave_type1, leave_type2 = self.env['hr.leave.type'].create([ + { + 'name': 'Leave type 1', + 'time_type': 'leave', + 'requires_allocation': True, + }, { + 'name': 'Leave type 2', + 'time_type': 'leave', + 'requires_allocation': True, + }, + ]) + self.env['hr.leave.allocation'].create([{ + 'name': 'Leave type 1 allocation', + 'holiday_status_id': leave_type1.id, + 'number_of_days': 1, + 'employee_id': employee_id.id, + 'state': 'confirm', + }]).action_approve() + leave_type_ids = self.env['hr.leave.type'].with_context(employee_id=employee_id.id).search([('virtual_remaining_leaves', '>', 0)]) + self.assertIn(leave_type1, leave_type_ids) + self.assertNotIn(leave_type2, leave_type_ids) diff --git a/addons/hr_skills/report/hr_employee_certification_report_views.xml b/addons/hr_skills/report/hr_employee_certification_report_views.xml index 779796d0449fe..079ef1f790fd9 100644 --- a/addons/hr_skills/report/hr_employee_certification_report_views.xml +++ b/addons/hr_skills/report/hr_employee_certification_report_views.xml @@ -44,4 +44,28 @@ + + + Certification + hr.employee.certification.report + + list,pivot + { + 'search_default_employee': 1, + } + +

+

+ This report will give you an overview of the certification per Employee. + Create them in configuration and add them on the Employee. +

+ + + + diff --git a/addons/hr_skills/report/hr_employee_skill_report_views.xml b/addons/hr_skills/report/hr_employee_skill_report_views.xml index 86b997da5ffbb..bddca497eb6ef 100644 --- a/addons/hr_skills/report/hr_employee_skill_report_views.xml +++ b/addons/hr_skills/report/hr_employee_skill_report_views.xml @@ -89,6 +89,6 @@ id="hr_employee_skill_inventory_report_menu" name="Skills Inventory" action="hr_employee_skill_report_action" - parent="hr.hr_menu_hr_reports" + parent="hr_skills.hr_employee_skill_report_menu" sequence="15"/> diff --git a/addons/hr_skills/views/hr_views.xml b/addons/hr_skills/views/hr_views.xml index 3e6e8d47e4ca9..d90f958e3c858 100644 --- a/addons/hr_skills/views/hr_views.xml +++ b/addons/hr_skills/views/hr_views.xml @@ -593,7 +593,7 @@ hr.employee.skill certifications [('is_certification', '=', True)] - {'show_employee': True} + {'show_employee': True, 'search_default_group_by_type': 1} list,form + +