From 7482f1166b4ffb431db923411001481ba2fc2f89 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 19 Sep 2011 15:23:41 +0530
Subject: [PATCH] [IMP]Events : Improve the search view

bzr revid: dbr@tinyerp.com-20110919095341-2yupmuw6nsz690bq
---
 addons/event/event_view.xml                   |  4 +--
 .../report/report_event_registration_view.xml | 31 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cb31ad04b65..ad72e2b51e2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -229,7 +229,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+                        <filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
@@ -475,7 +475,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
+                        <filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 11d8592350b..17c8f26a8b6 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,21 +53,24 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter icon="terp-go-year" string="Last 365 Days" name="365day"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events with beginning date in last 365 days"/>
-                    <filter icon="terp-go-month" string="Last 30 Days"
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events with beginning date in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="Last 7 Days"
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Events with beginning date in last 7 days"/>
+					<filter string="  Year  " icon="terp-go-year"
+                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                          help="Events created in current year"/>
+                    <filter string="   Month   " icon="terp-go-month" name="this_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="Events created in 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="Events created in last month"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-check"
-                        string="Current Events" name="draft"
-                        domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+					<filter icon="terp-document-new"
+						string="New"
+						domain="[('state','=','draft')]"
+						help="Events which are in draft state"/>
+					<filter icon="terp-check"
+						string="Confirm"
+						domain="[('state','=','confirm')]"
+						help="Events which are in confirm state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                           string="Confirmed Registrations"