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

[FIX] email_template merge fix for sender, by Olivier Ligot openerp-groupes/openobject-addons/fix_email_template 

bzr revid: al@openerp.com-20110117204840-6gurujg428q8k4e1
This commit is contained in:
Antony Lesuisse 2011-01-17 21:48:40 +01:00
parent 948764a7b2 f76cb13bed
commit c5f3f35cae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/email_template/email_template.py
View File

@ -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.