From cca08468043c17025cfbd6fd771227cc67ee93a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 28 Feb 2013 14:49:01 +0100 Subject: [PATCH] [FIX] email_template: fixed attachments management in send_mail. bzr revid: tde@openerp.com-20130228134901-ibtnt2zl4yne7o4n --- addons/email_template/email_template.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 64c09d1eaff..1856479ebbe 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -379,11 +379,11 @@ class email_template(osv.osv): # manage attachments attachment_ids = values.pop('attachment_ids', []) attachments = values.pop('attachments', []) - for fname, fcontent in attachments: + for attachment in attachments: attachment_data = { - 'name': fname, - 'datas_fname': fname, - 'datas': fcontent, + 'name': attachment[0], + 'datas_fname': attachment[0], + 'datas': attachment[1], 'res_model': values.get('model', False), 'res_id': values.get('res_id', False), }