From 207e964b2bb55f4dc9d3a4f18245fd8227c87864 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 10 Nov 2011 15:50:59 +0530
Subject: [PATCH 1/2] [IMP]marketing:improvement analysis report

bzr revid: kbh@tinyerp.com-20111110102059-oijxnmbsfxk1uz42
---
 .../report/campaign_analysis_view.xml                 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 653cc5c553d..ba2e438af69 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -32,12 +32,17 @@
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                    <group>
-                    <filter icon="terp-go-year"
+                    <filter icon="terp-go-year" name="year"
                             string="This Year"
                             domain="[('year','=',time.strftime('%%Y'))]"/>
+                    <separator orientation="vertical"/>
+
                     <filter icon="terp-go-month"
-                            string="This Month"
+                            string="This Month" name="This Month"
                             domain="[('month','=',time.strftime('%%m'))]"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
+
                     <filter icon="terp-go-today"
                             string="Today"
                             domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
@@ -81,7 +86,7 @@
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year': 1,"search_default_This Month":1,'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 

From 20a06c35cafea5ad374d11f4d6d7d3aad2eb8aba Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 11 Nov 2011 14:13:58 +0530
Subject: [PATCH 2/2] [IMP]marketing:improvement analysis report

bzr revid: kbh@tinyerp.com-20111111084358-6xxzvw3x1bfmreo8
---
 addons/marketing_campaign/report/campaign_analysis_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index ba2e438af69..1bfdf69acf0 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -33,12 +33,12 @@
             <search string="Campaign Analysis">
                    <group>
                     <filter icon="terp-go-year" name="year"
-                            string="This Year"
+                            string="Year"
                             domain="[('year','=',time.strftime('%%Y'))]"/>
                     <separator orientation="vertical"/>
 
                     <filter icon="terp-go-month"
-                            string="This Month" name="This Month"
+                            string="Month" name="This Month"
                             domain="[('month','=',time.strftime('%%m'))]"/>
                     <filter icon="terp-go-month" string="    Month-1    "
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>