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/static/src/components/button_new_contract/button_new_contract.xml b/addons/hr/static/src/components/button_new_contract/button_new_contract.xml index cb5594de67892..ff1d8447bf582 100644 --- a/addons/hr/static/src/components/button_new_contract/button_new_contract.xml +++ b/addons/hr/static/src/components/button_new_contract/button_new_contract.xml @@ -3,7 +3,7 @@ + t-ref="datetime-picker-target-new-contract">New Contract diff --git a/addons/hr/tests/test_hr_version.py b/addons/hr/tests/test_hr_version.py index a2b8e3ab298c2..241f7632a7926 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 @@ -697,3 +676,20 @@ def test_hr_version_fields_tracking(self): fields_without_tracking, f"The following hr.version fields should have tracking=True: {fields_without_tracking}", ) + + def test_delete_hr_version(self): + employee = self.env['hr.employee'].create( + { + 'name': 'John Doe', + 'date_version': '2024-01-01', + } + ) + + version1 = employee.version_id + version2 = employee.create_version({ + 'date_version': '2025-01-01', + }) + + version1.unlink() + with self.assertRaises(ValidationError): + version2.unlink() diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml index 3a733cf199e42..08dd2b395ff16 100644 --- a/addons/hr/views/hr_employee_views.xml +++ b/addons/hr/views/hr_employee_views.xml @@ -370,7 +370,7 @@ to - +