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

[FIX] email_template: error message instead of traceback when sending an email from a user without user 

bzr revid: mat@openerp.com-20140122094837-a0bkx2huqvkylniy
This commit is contained in:
Martin Trigaux 2014-01-22 10:48:37 +01:00
parent d5bc07f898 27686df49d
commit b25d08f917
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/email_template/email_template.py
View File

@ -376,8 +376,8 @@ class email_template(osv.osv):
# create a mail_mail based on values, without attachments
values = self.generate_email(cr, uid, template_id, res_id, context=context)
assert values.get('email_from'), 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
if not values.get('email_from'):
raise osv.except_osv(_('Warning!'),_("Sender email is missing or empty after template rendering. Specify one to deliver your message"))
# process email_recipients field that is a comma separated list of partner_ids -> recipient_ids
# NOTE: only usable if force_send is True, because otherwise the value is
# not stored on the mail_mail, and therefore lost -> fixed in v8