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

bzr revid: mdi@tinyerp.com-20120522072416-00ijo6jf6k0al61p
---
 .../hr_timesheet_invoice_report_view.xml      | 24 -------------------
 .../report/report_analytic_view.xml           |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index be090dfcdbb..07cffe9ea2c 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -47,18 +47,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                      <filter icon="terp-go-year" string="This Year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet lines in this year"/>
-                      <filter icon="terp-go-month" string="This 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="Timesheet lines in this month"/>
-                    <filter icon="terp-go-week"
-                              string="    7 Days    "
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                              help="Timesheet lines during last 7 days"/>
-                      <separator orientation="vertical"/>
                       <field name="user_id" widget="selection">
                           <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
@@ -162,10 +150,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="user_id"/>
@@ -298,10 +282,6 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -370,10 +350,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c196beae880..c32ae7a076b 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,9 +114,6 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="product_id"/>