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

[IMP] marketing campaign 

bzr revid: fp@tinyerp.com-20100610205045-vs4jmbu8cbcae27w
This commit is contained in:
Fabien Pinckaers 2010-06-10 22:50:45 +02:00
parent de2d11830d
commit 21cd9e7a98
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/marketing_campaign/marketing_campaign.py
View File

@ -165,10 +165,12 @@ class marketing_campaign_segment(osv.osv):
if segment.sync_last_date:
criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
if segment.ir_filter_id:
criteria += segment.ir_filter_id.domain
object_ids = model_obj.search(cr, uid, criteria)
criteria += eval(segment.ir_filter_id.domain)
object_ids = model_obj.search(cr, uid, criteria, context=context)
print segment.object_id.model, criteria
for o_ids in model_obj.browse(cr, uid, object_ids, context=context) :
print 'Found Object', o_ids.name
# avoid duplicated workitem for the same resource
if segment.sync_mode == 'write_date':
segids = self.pool.get('marketing.campaign.workitem').search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)])
@ -367,7 +369,7 @@ class marketing_campaign_workitem(osv.osv):
'res_id': fields.integer('Resource ID'),
'res_name': fields.function(_res_name_get, method=True, string='Resource Name', type="char", size=64),
'date': fields.datetime('Execution Date'),
'partner_id': fields.many2one('res.partner', 'Partner',required=True),
'partner_id': fields.many2one('res.partner', 'Partner'),
'state': fields.selection([('todo', 'ToDo'), ('inprogress', 'In Progress'),
('exception', 'Exception'), ('done', 'Done'),
('cancelled', 'Cancelled')], 'State'),

4
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -154,12 +154,12 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,diagram</field>
<field name="view_id" ref="view_marketing_campaign_tree"/>
<field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}</field>
<field name="context">{'group_by': []}</field>
<field name="search_view_id" ref="view_marketing_campaign_search"/>
</record>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
<!--