[IMP]: marketing_campaign: Improevement in reporting

bzr revid: rpa@tinyerp.com-20100826100325-t3tjytoi0w5tks3j

2 files changed, 7 insertions, 2 deletions

diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index c9b643a4965..aa0e0e01a22 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -42,6 +42,7 @@ class campaign_analysis(osv.osv):
             result[ca_obj.id] = total_cost
         return result
     _columns = {
+        'res_id' : fields.integer('Resource', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'),
                     ('03','March'), ('04','April'),('05','May'), ('06','June'),
@@ -69,6 +70,7 @@ class campaign_analysis(osv.osv):
             create or replace view campaign_analysis as (
             select
                 min(wi.id) as id,
+                min(wi.res_id) as res_id,
                 to_char(wi.date::date, 'YYYY') as year,
                 to_char(wi.date::date, 'MM') as month,
                 wi.date::date as date,
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 94d31fcb441..d88be86d01e 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -15,6 +15,7 @@
                 <field name="segment_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
+                <field name="res_id" invisible="1"/>
                 <field name="count"/>
                 <field name="total_cost" string="Cost"/><!-- sum="Cost"/-->
                 <field name="revenue"/>
@@ -35,7 +36,7 @@
                     <filter icon="terp-go-month"
                             string="This Month"
                             domain="[('month','=',time.strftime('%%m'))]"/>
-                    <filter icon="terp-go-month"
+                    <filter icon="terp-go-today"
                             string="Today"
                             domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
                     <separator orientation="vertical"/>
@@ -59,7 +60,9 @@
                 <group expand="0" string="Group By..." colspan="10" col="12">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                    <filter string="State" icon="terp-stock_symbol-selection" context="{'group_by':'state'}"/>
+                    <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
+                    <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>