From 6543554b95ad218eece9a4c4f2142f31cf2d971c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Nov 2015 14:21:55 +0100
Subject: [PATCH] [FIX] hr_holidays: Year filter

This filter filters requests for this year. However allocation requests do not
have date_from and date_to. For requests not having those dates the filter
takes requests whose type (holiday_status_id) is active. This was the old
Year filter, that is applied only to allocation requests now. Leave request
are still based on date_from and date_to.
---
 addons/hr_holidays/hr_holidays_view.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 68096ee429e..9e215da404f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -38,10 +38,11 @@
                     <filter string="To Do" name="todo" domain="[('payslip_status', '=', False), ('holiday_status_id.active', '=', True)]"/>
                     <separator/>
                     <filter name="year" string="Year"
-                        domain="['|','&amp;',('date_to', '&lt;=', time.strftime('%%Y-12-31')),
-                                             ('date_to', '&gt;=', time.strftime('%%Y-01-01')),
-                                     '&amp;',('date_from', '&lt;=', time.strftime('%%Y-12-31')),
-                                             ('date_from', '&gt;=', time.strftime('%%Y-01-01'))]"
+                        domain="['|',
+'&amp;', '&amp;', ('date_to', '=', False), ('date_from', '=', False), ('holiday_status_id.active', '=', True),
+'|',
+    '&amp;',('date_to', '&lt;=', time.strftime('%%Y-12-31')), ('date_to', '&gt;=', time.strftime('%%Y-01-01')),
+    '&amp;',('date_from', '&lt;=', time.strftime('%%Y-12-31')), ('date_from', '&gt;=', time.strftime('%%Y-01-01'))]"
                         help="Current Year Leaves"/>
                     <separator/>
                     <filter string="My Requests" name="my_leaves" domain="[('user_id', '=', uid)]"/>