[MERGE] forward port of branch 8.0 up to 591e329

[odoo/odoo.git] / addons / mass_mailing / models / mass_mailing.py

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 71d320b..0e5f782 100644 (file)
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -621,6 +621,7 @@ class MassMailing(osv.Model):
             comp_ctx = dict(context, active_ids=res_ids)
             composer_values = {
                 'author_id': author_id,
+                'attachment_ids': [(4, attachment.id) for attachment in mailing.attachment_ids],
                 'body': mailing.body_html,
                 'subject': mailing.name,
                 'model': mailing.mailing_model,