Update : adapt to change from email_template from openobject-server

Tree is up to date at revision 3663 of branch http://bazaar.launchpad.net/~openerp/openobject-server/trunk
Tue Sep 27 16:00:15 CEST 2011

def_body_text => body_text
def_body_html => body_html
generate_mail => send_mail

marketing_campaign_tracker.py

@@ -48,7 +48,7 @@
         if context.get('use_tracker', False):
             # here we need to use tracker so let's do it
             tracker_base = context.get('tracker_base')
-            text = template.def_body_text
+            text = template.body_text
             template.def_body_text, tracks = insert_tracker_in_text(
                 text, tracker_base, context['activity_id'])
 
@@ -58,7 +58,7 @@
                 # create a trackitem for each URL that is replaced
                 trackitem.create(cursor, user, trackvalues, context=None)
 
-            html = template.def_body_html
+            html = template.body_html
             template.def_body_html, tracks = insert_tracker_in_html(
                 html, tracker_base, context['activity_id'])
 
@@ -147,5 +147,5 @@
             context['tracker_base'] = activity.tracker_base.rstrip('/')
             context['activity_id'] = activity.id
 
-        return self.pool.get('email.template').generate_mail(cr, uid,
+        return self.pool.get('email.template').send_mail(cr, uid,
                                             activity.email_template_id.id,
@@ -151,5 +151,6 @@
                                             activity.email_template_id.id,
-                                            [workitem.res_id], context=context)
+                                            workitem.res_id, context=context)
+        
 
 marketing_campaign_activity()