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

[FIX] mail*: properly handle b64-encoding for attachments 

When reading the datas property of an attachment,
a base64-encoded stream is expected.
The mail.message.schedule_with_attach() method OTOH
expects a binary file for attachments, so it should
be decoded if extracted from a binary field.

bzr revid: odo@openerp.com-20120308155650-blnwf7x2bkmsfue2
This commit is contained in:
Olivier Dony 2012-03-08 16:56:50 +01:00
parent 66e1ce8606
commit 86a7978d2d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_message.py
View File

@ -263,7 +263,7 @@ class mail_message(osv.osv):
attachment_data = {
'name': fname,
'datas_fname': fname,
'datas': fcontent,
'datas': fcontent and fcontent.encode('base64'),
'res_model': self._name,
'res_id': email_msg_id,
}

2
addons/mail/wizard/mail_compose_message.py
View File

@ -194,7 +194,7 @@ class mail_compose_message(osv.osv_memory):
for mail in self.browse(cr, uid, ids, context=context):
attachment = {}
for attach in mail.attachment_ids:
attachment[attach.datas_fname] = attach.datas
attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
references = None
headers = {}