From abdd3038545eb20e7a8eb711bd3bb936c4ec2d4b Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 6 Apr 2011 18:00:00 +0530 Subject: [PATCH] [FIX] email_template: fix reference for generate_tracking_message_id() bzr revid: rha@tinyerp.com-20110406123000-ow2j0mjfhplp1lb5 --- addons/email_template/email_template.py | 2 +- addons/email_template/wizard/email_template_preview.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 989a9d07eb5..476174db32f 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -394,7 +394,7 @@ This is useful for CRM leads for example"), elif template['track_campaign_item']: # get appropriate message-id - values.update({'message_id': smtp_pool.generate_tracking_message_id(record_id)}) + values.update({'message_id': tools.generate_tracking_message_id(record_id)}) #Use signatures if allowed if template.user_signature: diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py index f1636a64de8..00e20b98cf3 100644 --- a/addons/email_template/wizard/email_template_preview.py +++ b/addons/email_template/wizard/email_template_preview.py @@ -93,8 +93,7 @@ class email_template_preview(osv.osv_memory): if template.message_id: vals['message_id'] = self.get_template_value(cr, uid, message_id, model, res_id, context) elif template.track_campaign_item: - smtp_server_obj = self.pool.get('ir.mail_server') - vals['message_id'] = smtp_server_obj.generate_tracking_message_id(res_id) + vals['message_id'] = tools.generate_tracking_message_id(res_id) vals['subject'] = self.get_template_value(cr, uid, template.subject, model, res_id, context) description = self.get_template_value(cr, uid, template.body, model, res_id, context) or '' if template.user_signature: