From dd36a0e5093df90bd92667d26f529a3a79fe0397 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Sun, 1 Jun 2014 22:08:56 +0200 Subject: [PATCH] [FIX] mass_mailing: on mass mailing sending, set same_thread for message composer same_thread boolean field of mail.compose.message model define wether or not replies should be posted in the thread or not On composer creation, this boolean should be passed according to the reply_to_mode of the mass_mailing Otherwise, all replies would be posted in the thread, and the reply_to will be ignored (if same_thread id True, reply_to is poped from the mails values, mail/wizard/mail_compose_message.py:284) --- addons/mail/wizard/mail_compose_message.py | 2 ++ addons/mass_mailing/models/mass_mailing.py | 1 + 2 files changed, 3 insertions(+) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index cb068d5..d51118c 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -244,6 +244,8 @@ class mail_compose_message(osv.TransientModel): def get_mail_values(self, cr, uid, wizard, res_ids, context=None): """Generate the values that will be used by send_mail to create mail_messages or mail_mails. """ + import pudb + pudb.set_trace() results = dict.fromkeys(res_ids, False) rendered_values, default_recipients = {}, {} mass_mail_mode = wizard.composition_mode == 'mass_mail' diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 18c5ad5..bfeb3ae 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -571,6 +571,7 @@ class MassMailing(osv.Model): 'composition_mode': 'mass_mail', 'mass_mailing_id': mailing.id, 'mailing_list_ids': [(4, l.id) for l in mailing.contact_list_ids], + 'same_thread': mailing.reply_to_mode == 'thread', } if mailing.reply_to_mode == 'email': composer_values['reply_to'] = mailing.reply_to -- 1.7.10.4