pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] mail: mail_template: instead of crashing when sending email based on

Browse Source 
templates that have a void email_from, just fall back on the default email_from
defined on the mail_message model.
This commit is contained in:
Jignesh Rathod
2015-03-24 10:18:16 +01:00
committed by Thibault Delavallée
parent 2c13ea9c6f
commit a8d8046cf2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/mail_template.py
+3 -2
View File
@@ -551,11 +551,12 @@ class mail_template(osv.osv):
# create a mail_mail based on values, without attachments
values = self.generate_email(cr, uid, template_id, res_id, context=context)
if not values.get('email_from'):
raise UserError(_("Sender email is missing or empty after template rendering. Specify one to deliver your message"))
values['recipient_ids'] = [(4, pid) for pid in values.get('partner_ids', list())]
attachment_ids = values.pop('attachment_ids', [])
attachments = values.pop('attachments', [])
# add a protection against void email_from
if 'email_from' in values and not values.get('email_from'):
values.pop('email_from')
msg_id = mail_mail.create(cr, uid, values, context=context)
mail = mail_mail.browse(cr, uid, msg_id, context=context)