From 0fe0b3ea16d39c76b5a2934c9e9014db12f03d85 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 20 Sep 2011 15:08:58 +0530
Subject: [PATCH] [IMP]membership : Add filters in search view

bzr revid: dbr@tinyerp.com-20110920093858-1bn9zz89f80a5zig
---
 .../report/report_membership_view.xml         | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 0e6ddc630f6..f219fe364c4 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,14 +36,19 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <group>
-                        <filter string="Last 365 Days" icon="terp-go-year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="month"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
+                        <filter string="  Year  " icon="terp-go-year"
+                        domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
+                        help="Events created in current year"/>
+                        <filter string="   Month   " icon="terp-go-month" name="this_month"
+                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Events created in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    "
+                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Events created in last month"/>
+	                    <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                         <separator orientation="vertical"/>
+                        <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
@@ -91,7 +96,7 @@
             <field name="res_model">report.membership</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_report_membership_search"/>
-            <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_salesman':1, }</field>
+            <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1, }</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">