From 94c010b8a13ff19e851681455e8fee4138700880 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 12:33:48 +0530
Subject: [PATCH] [IMP] hr_expense : Removed all filters related to a date
 field and added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522070348-mollhizuy7zbgd5q
---
 addons/hr_expense/hr_expense_view.xml               |  3 ---
 addons/hr_expense/report/hr_expense_report_view.xml | 12 ------------
 2 files changed, 15 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e54e38e429a..375e3ec2ef0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -142,9 +142,6 @@
                       <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
-                      <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                      <separator orientation="vertical"/>
                       <field name="employee_id"/>
                       <field name="date"/>
                       <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 32f4ab32b65..c09cb847385 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -53,18 +53,6 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="Year" name="year"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                      help="Expenses during current year"/>
-                    <separator orientation="vertical"/>					  
-                  <filter icon="terp-go-month" string="Month"
-                      name="month"
-                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " 
-                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                  <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"