From ea6a3785bb161075e95937ec6001a10c95bf6f8a Mon Sep 17 00:00:00 2001 From: Bhavik Bagdiya Date: Thu, 11 Sep 2014 18:36:03 +0530 Subject: [PATCH] [IMP] mass_mailing: option to keep sent emails --- addons/mass_mailing/models/mass_mailing.py | 1 + addons/mass_mailing/views/mass_mailing.xml | 1 + addons/mass_mailing/wizard/mail_compose_message.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 4912c1e..cccf3a2 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -382,6 +382,7 @@ class MassMailing(osv.Model): 'ir.attachment', 'mass_mailing_ir_attachments_rel', 'mass_mailing_id', 'attachment_id', 'Attachments' ), + 'keep_archives': fields.boolean('Keep Archives'), 'mass_mailing_campaign_id': fields.many2one( 'mail.mass_mailing.campaign', 'Mass Mailing Campaign', ondelete='set null', diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index 3a4938b..5a7fca3 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -365,6 +365,7 @@ on_change="on_change_model_and_list(mailing_model, contact_list_ids)"/> + diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py index 5f9bcc2..de3f6e6 100644 --- a/addons/mass_mailing/wizard/mail_compose_message.py +++ b/addons/mass_mailing/wizard/mail_compose_message.py @@ -58,6 +58,6 @@ class MailComposeMessage(osv.TransientModel): })], # email-mode: keep original message for routing 'notification': mass_mailing.reply_to_mode == 'thread', - 'auto_delete': True, + 'auto_delete': not mass_mailing.keep_archives, }) return res -- 1.7.10.4