odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: marketing_campaign: Make campaign_id stored on Followups, added Campaign in search view of Followups 

bzr revid: rpa@tinyerp.com-20100831132331-086gz8ilbwvgj39z
This commit is contained in:
rpa (Open ERP) 2010-08-31 18:53:31 +05:30
parent 26cc5042f6
commit 4dc8c1acfb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/marketing_campaign/marketing_campaign.py
View File

@ -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),

3
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -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'}" />