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

[REV] email_template: send_mail: back to 2-steps creation, because attachments have to be garbage-collected, and not attached to the document. 

bzr revid: tde@openerp.com-20130306134410-mw9hau809qh1nbqh
This commit is contained in:
Thibault Delavallée 2013-03-06 14:44:10 +01:00
parent 7999477d63
commit f789005c9a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/email_template/email_template.py
View File

@ -375,25 +375,25 @@ class email_template(osv.osv):
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'
del values['email_recipients'] # TODO Properly use them.
template = self.get_email_template(cr, uid, template_id, res_id, context=context)
# manage attachments
attachment_ids = values.pop('attachment_ids', [])
attachments = values.pop('attachments', [])
msg_id = mail_mail.create(cr, uid, values, context=context)
# manage attachments
for attachment in attachments:
attachment_data = {
'name': attachment[0],
'datas_fname': attachment[0],
'datas': attachment[1],
'res_model': template.model,
'res_id': res_id,
'res_model': 'mail.message',
'res_id': msg_id,
}
context.pop('default_type', None)
attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
if attachment_ids:
values['attachment_ids'] = [(6, 0, attachment_ids)]
mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
msg_id = mail_mail.create(cr, uid, values, context=context)
if force_send:
mail_mail.send(cr, uid, [msg_id], context=context)
return msg_id