From 2b70abe484aa32f46bb292c4d94c7cff5fe1299c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Fri, 24 Aug 2018 14:27:19 +0200
Subject: [PATCH] [FIX] hr_holidays: allow to reinitialize module

Demo data prevent from reinitializing hr_holidays module. Indeed confirming
already confirmed leaves or allocations does not work. Demo data are
updated so that we can initialize hr_holidays several times.

This commit is linked to task ID 1876795 and PR #26423.
---
 addons/hr_holidays/data/hr_holidays_demo.xml | 26 ++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/data/hr_holidays_demo.xml b/addons/hr_holidays/data/hr_holidays_demo.xml
index 72adb03ea37..0ab4e8a574e 100644
--- a/addons/hr_holidays/data/hr_holidays_demo.xml
+++ b/addons/hr_holidays/data/hr_holidays_demo.xml
@@ -59,7 +59,24 @@
     </record>
 
     <!-- approve the first 3 leave allocations -->
-    <function model="hr.leave.allocation" name="action_approve" eval="[[ref('hr_holidays.hr_holidays_employee1_allocation_cl'), ref('hr_holidays.hr_holidays_employee1_int_tour'), ref('hr_holidays_employee1_allocation_hl')]]"/>
+    <function model="hr.leave.allocation" name="action_approve">
+        <value model="hr.leave.allocation" search="[
+            ('state', '=', 'confirm'),
+            ('id', 'in', [ref('hr_holidays.hr_holidays_employee1_allocation_cl')])
+        ]"/>
+    </function>
+    <function model="hr.leave.allocation" name="action_approve">
+        <value model="hr.leave.allocation" search="[
+            ('state', '=', 'confirm'),
+            ('id', 'in', [ref('hr_holidays.hr_holidays_employee1_int_tour')])
+        ]"/>
+    </function>
+    <function model="hr.leave.allocation" name="action_approve">
+        <value model="hr.leave.allocation" search="[
+            ('state', '=', 'confirm'),
+            ('id', 'in', [ref('hr_holidays_employee1_allocation_hl')])
+        ]"/>
+    </function>
 
     <record id="hr_holidays_employee1_cl" model="hr.leave">
         <field name="name">Trip with Family</field>
@@ -81,7 +98,12 @@
     </record>
 
     <!-- approve the leave request -->
-    <function model="hr.leave" name="action_approve" eval="[[ref('hr_holidays.hr_holidays_employee1_sl')]]"/>
+    <function model="hr.leave" name="action_approve">
+        <value model="hr.leave" search="[
+            ('state', '=', 'confirm'),
+            ('id', 'in', [ref('hr_holidays.hr_holidays_employee1_sl')])
+        ]"/>
+    </function>
 
 </data>
 </odoo>