From e8637a9cfc103e455c19ea862f6b829c15bbe716 Mon Sep 17 00:00:00 2001
From: arpi-odoo <arpi@odoo.com>
Date: Mon, 3 Nov 2025 15:01:47 +0100
Subject: [PATCH 1/4] [IMP] empty


From a1657208e02a064082a9586270ffdf407b8202b8 Mon Sep 17 00:00:00 2001
From: hkafe-odoo <hkafe@odoo.com>
Date: Mon, 3 Nov 2025 14:05:18 +0100
Subject: [PATCH 2/4] [FIX] hr: hide new contract button if there is no
 contract dates

This hides the New Contract button when there are no contracts associated with the employee.

Task: 5231904
---
 addons/hr/views/hr_employee_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
                                             <span invisible="not contract_date_start">to</span>
                                             <field name="contract_date_end" string="End Date" placeholder="Indefinite"
                                                 class="o_hr_narrow_field ms-3" invisible="not contract_date_start"/>
-                                            <widget name="button_new_contract"/>
+                                            <widget name="button_new_contract" invisible="not contract_date_start"/>
                                         </div>
                                         <label for="wage"/>
                                         <div class="o_row" name="wage">

From 3a7160b8eac915f758c9c7e0aeef28d9d92c24ff Mon Sep 17 00:00:00 2001
From: hkafe-odoo <hkafe@odoo.com>
Date: Mon, 3 Nov 2025 15:42:46 +0100
Subject: [PATCH 3/4] [FIX] hr: allow version deletion for employees with
 multiple versions

This makes it possible to delete a version if there are multiple versions for one employee.

Task: 5232093
---
 addons/hr/models/hr_employee.py    |  3 ++-
 addons/hr/tests/test_hr_version.py | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index dc20f57822e22..b470d2d7f557e 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -495,7 +495,8 @@ def _compute_legal_name(self):
     @api.depends('current_version_id')
     @api.depends_context('version_id')
     def _compute_version_id(self):
-        context_version = self.env['hr.version'].browse(self.env.context.get('version_id', False))
+        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']
 
         for employee in self:
             if context_version.employee_id == self:
diff --git a/addons/hr/tests/test_hr_version.py b/addons/hr/tests/test_hr_version.py
index ab585bc77163f..241f7632a7926 100644
--- a/addons/hr/tests/test_hr_version.py
+++ b/addons/hr/tests/test_hr_version.py
@@ -676,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()

From 47b6005253d33d97be4f4ca93181825610ac92e5 Mon Sep 17 00:00:00 2001
From: hkafe-odoo <hkafe@odoo.com>
Date: Tue, 4 Nov 2025 17:01:15 +0100
Subject: [PATCH 4/4] [FIX] hr_holidays: fix search on leave type

**Steps to reproduce:**
Navigate to Time Off >> Configuration >> Time Off Types >> Open any type, navigate to the Smart button Time Off >> Click on New >> Time Off Type
Leads to an error.

Reference Video: https://drive.google.com/file/d/1vi_apL24Km5tSomQtwcTArqqWvrBR5ni/view?usp=drive_link

**Reason:**
The `op` function is a comparison operator function that expects two values to compare and we are only passing to it `leave_type.virtual_remaining_leaves` parameter.

**Solution:**
Added the missing `value` parameter.

Task: 5238200
---
 addons/hr_holidays/models/hr_leave_type.py    |  2 +-
 .../hr_holidays/tests/test_hr_leave_type.py   | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py
index 8cedee4bed916..f93d621cc8a73 100644
--- a/addons/hr_holidays/models/hr_leave_type.py
+++ b/addons/hr_holidays/models/hr_leave_type.py
@@ -280,7 +280,7 @@ def _search_virtual_remaining_leaves(self, operator, 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)
+            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..f2ae35af62bc7 100644
--- a/addons/hr_holidays/tests/test_hr_leave_type.py
+++ b/addons/hr_holidays/tests/test_hr_leave_type.py
@@ -114,3 +114,59 @@ 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 = self.env['hr.employee'].create({'name': 'Test Employee'})
+        leave_type_1 = self.env['hr.leave.type'].create({
+            'name': 'Test Leave 1',
+            'requires_allocation': True,
+        })
+        leave_type_2 = self.env['hr.leave.type'].create({
+            'name': 'Test Leave 2',
+            'requires_allocation': False,
+        })
+
+        self.env['hr.leave.allocation'].sudo().create({
+            'state': 'confirm',
+            'holiday_status_id': leave_type_1.id,
+            'employee_id': employee.id,
+            'number_of_days': 4,
+            'date_from': '2025-01-01',
+            'date_to': '2025-12-31',
+        }).action_approve()
+
+        result = (
+            self.env["hr.leave.type"]
+            .with_context(employee_id=employee.id)
+            .search([("virtual_remaining_leaves", ">", 0)])
+        )
+        self.assertIn(
+            leave_type_1, result, "Leave Type 1 should be in the result as it has remaining leaves",
+        )
+        self.assertIn(
+            leave_type_2, result, "Leave Type 2 should be in the result since it does not require allocation",
+        )
+
+        result = (
+            self.env["hr.leave.type"]
+            .with_context(employee_id=employee.id)
+            .search([("virtual_remaining_leaves", "=", 0)])
+        )
+        self.assertNotIn(
+            leave_type_1, result, "Leave Type 1 should not be in the result as it has remaining leaves != 0",
+        )
+        self.assertIn(
+            leave_type_2, result, "Leave Type 2 should be in the result since it does not require allocation",
+        )
+
+        result = (
+            self.env["hr.leave.type"]
+            .with_context(employee_id=employee.id)
+            .search([("virtual_remaining_leaves", ">", 4)])
+        )
+        self.assertNotIn(
+            leave_type_1, result, "Leave Type 1 should not be in the result",
+        )
+        self.assertIn(
+            leave_type_2, result, "Leave Type 2 should be in the result since it does not require allocation",
+        )