[MERGE] forward port branch 9.0 up to baca743cc0

2017-08-09 14:14:44 +02:00
parent 6a767a8900 baca743cc0
commit acbcfa3703
2 changed files with 2 additions and 0 deletions
@@ -569,6 +569,7 @@ class MailTemplate(models.Model):
                'name': attachment[0],
                'datas_fname': attachment[0],
                'datas': attachment[1],
+                'type': 'binary',
                'res_model': 'mail.message',
                'res_id': mail.mail_message_id.id,
            }
@@ -1673,6 +1673,7 @@ class MailThread(models.AbstractModel):
            data_attach = {
                'name': name,
                'datas': base64.b64encode(str(content)),
+                'type': 'binary',
                'datas_fname': cid or name,
                'description': name,
                'res_model': message_data['model'],