From 2006269fc80b2075ea2b394ee89568922fa5907f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 30 Mar 2015 21:37:31 +0530 Subject: [PATCH] Fixed bulk.py --- frappe/email/bulk.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/email/bulk.py b/frappe/email/bulk.py index be4b08c5f1..6bd05abb5d 100644 --- a/frappe/email/bulk.py +++ b/frappe/email/bulk.py @@ -56,17 +56,20 @@ def send(recipients=None, sender=None, subject=None, message=None, reference_doc for email in filter(None, list(set(recipients))): if email not in unsubscribed: + email_content = formatted + email_text_context = text_content + if reference_doctype: unsubscribe_url = get_unsubcribed_url(reference_doctype, reference_name, email, unsubscribe_method, unsubscribe_params) # add to queue - updated = add_unsubscribe_link(formatted, email, reference_doctype, reference_name, + email_content = add_unsubscribe_link(email_content, email, reference_doctype, reference_name, unsubscribe_url, unsubscribe_message) - text_content += "\n" + _("Unsubscribe link: {0}").format(unsubscribe_url) + email_text_context += "\n" + _("Unsubscribe link: {0}").format(unsubscribe_url) - add(email, sender, subject, updated, text_content, reference_doctype, reference_name, attachments, reply_to, + add(email, sender, subject, email_content, email_text_context, reference_doctype, reference_name, attachments, reply_to, cc, message_id) def add(email, sender, subject, formatted, text_content=None,