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

bzr revid: mdi@tinyerp.com-20120522052001-zfuetczlp7ojm5gt
---
 addons/account/project/project_view.xml            |  3 ---
 .../account/report/account_invoice_report_view.xml | 14 +-------------
 addons/account/report/account_report_view.xml      |  6 ------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 72a47d6c820..46bcbb110ab 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -432,9 +432,6 @@
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
                     <group>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="month"/>
                         <field name="account_id"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 6e5f83a83d1..687f98be59f 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,19 +56,6 @@
         <field name="arch" type="xml">
             <search string="Invoices 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="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="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="last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -103,6 +90,7 @@
                    <field name="partner_id"/>
                    <field name="user_id" />
                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                   <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index fe2b8a3940a..2c6a8736522 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -149,9 +149,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-					<separator orientation="vertical"/>
 					<field name="name"/>
 					<field name="month"/>
                </search>
@@ -215,9 +212,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-					<separator orientation="vertical"/>
 					<field name="name"/>
 					<field name="month"/>
                </search>