From f76cb13bed6ec6939bfe24fdd9846bcbe732da04 Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Thu, 13 Jan 2011 14:02:17 +0100 Subject: [PATCH] [FIX] email template mailbox from field - Use variable name (email_id) instead of string ('email_id') - Remove comma at end of line so that email_from local variable type is unicode, and not tuple of unicode bzr revid: olivier.ligot@groupes.be-20110113130217-ibc8pc7vy11ekntm --- addons/email_template/email_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index eee1a13bb70..ee94b4c7c37 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -574,7 +574,7 @@ This is useful for CRM leads for example"), # we should keep it all, name is probably specified in the address email_from = from_account['email_id'] else: - email_from = tools.ustr(from_account['name']) + "<" + tools.ustr('email_id') + ">", + email_from = tools.ustr(from_account['name']) + "<" + tools.ustr(email_id) + ">" # FIXME: should do this in a loop and rename template fields to the corresponding # mailbox fields. (makes no sense to have different names I think.