From baca743cc0c604613b0408ef2d299bff0720ae37 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 9 Aug 2017 14:06:13 +0200
Subject: [PATCH] [FIX] mail: force attachment type

Do not rely on default value. The context can contains a `default_type`
value intended for another model.
---
 addons/mail/models/mail_template.py | 1 +
 addons/mail/models/mail_thread.py   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py
index d94e657efc0..84e1a6b4240 100644
--- a/addons/mail/models/mail_template.py
+++ b/addons/mail/models/mail_template.py
@@ -549,6 +549,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,
             }
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index e99fb435aae..bb1b91c5ed0 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1609,6 +1609,7 @@ class MailThread(models.AbstractModel):
             data_attach = {
                 'name': name,
                 'datas': base64.b64encode(str(content)),
+                'type': 'binary',
                 'datas_fname': name,
                 'description': name,
                 'res_model': attach_model,