From 4dc8c1acfb24e6da01ab42761cff732b812019fa Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 31 Aug 2010 18:53:31 +0530
Subject: [PATCH] [IMP]: marketing_campaign: Make campaign_id stored on
 Followups, added Campaign in search view of Followups

bzr revid: rpa@tinyerp.com-20100831132331-086gz8ilbwvgj39z
---
 addons/marketing_campaign/marketing_campaign.py       | 2 +-
 addons/marketing_campaign/marketing_campaign_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 14350582d9c..c9383b53b15 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -592,7 +592,7 @@ class marketing_campaign_workitem(osv.osv):
         'activity_id': fields.many2one('marketing.campaign.activity','Activity',
              required=True, readonly=True),
         'campaign_id': fields.related('activity_id', 'campaign_id',
-             type='many2one', relation='marketing.campaign', string='Campaign', readonly=True),
+             type='many2one', relation='marketing.campaign', string='Campaign', readonly=True, store=True),
         'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
              type='many2one', relation='ir.model', string='Resource', select=1, readonly=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 1044755798a..cbcb7fe1b76 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -340,6 +340,7 @@
                 <field name="date"/>
                 <field name="state"/>
                 <field name="res_id" invisible="1"/>
+                <field name="campaign_id" invisible="1"/>
                 <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                 <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                 <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
@@ -404,7 +405,7 @@
                <field name="date" select="1"/>
                <newline/>
                <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="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="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />