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 1/5] [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"

From fa56c87151eaa9d88ffbdc109f7296e3ba799164 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 19 Sep 2011 16:52:52 +0530
Subject: [PATCH 2/5] [IMP]Event : Improve the indentation

bzr revid: dbr@tinyerp.com-20110919112252-0nwc88bdgvmftbw3
---
 .../report/report_event_registration_view.xml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 17c8f26a8b6..d2497d863f8 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,7 +53,7 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-					<filter string="  Year  " icon="terp-go-year"
+                    <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"
@@ -63,14 +63,14 @@
                           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-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"/>
+                    <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"

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 3/5] [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">

From 89cb46e75dccaa2d96fdf724cb25fe4863fb9449 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 20 Sep 2011 17:23:13 +0530
Subject: [PATCH 4/5] [IMP]event: Improve the filters

bzr revid: dbr@tinyerp.com-20110920115313-mmxv35ss81932b1d
---
 addons/event/event_view.xml                            | 2 +-
 addons/event/report/report_event_registration_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ad72e2b51e2..ed59bd81321 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="New" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+                        <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index d2497d863f8..3fd24c0a366 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -66,7 +66,7 @@
                     <filter icon="terp-document-new"
                         string="New"
                         domain="[('state','=','draft')]"
-                        help="Events which are in draft state"/>
+                        help="Events which are in New state"/>
                     <filter icon="terp-check"
                         string="Confirm"
                         domain="[('state','=','confirm')]"

From f1cf24bc8e3f8058caa75edc55032a193ff9d9f9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 22 Sep 2011 12:46:11 +0530
Subject: [PATCH 5/5] [Imp]Improve code of registration search view

bzr revid: dbr@tinyerp.com-20110922071611-juobodb1sk7f96m5
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed59bd81321..f73d68da7e9 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -475,7 +475,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
-                        <filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
+                        <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />