projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
709c986
)
[IMP] mass_mailing: option to keep sent emails
author
Bhavik Bagdiya
<bba@openerp.com>
Thu, 11 Sep 2014 13:06:03 +0000
(18:36 +0530)
committer
Richard Mathot
<rim@openerp.com>
Thu, 2 Oct 2014 07:34:29 +0000
(09:34 +0200)
addons/mass_mailing/models/mass_mailing.py
patch
|
blob
|
history
addons/mass_mailing/views/mass_mailing.xml
patch
|
blob
|
history
addons/mass_mailing/wizard/mail_compose_message.py
patch
|
blob
|
history
diff --git
a/addons/mass_mailing/models/mass_mailing.py
b/addons/mass_mailing/models/mass_mailing.py
index
4912c1e
..
cccf3a2
100644
(file)
--- 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
(file)
--- 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)"/>
</div>
</div>
+ <field name="keep_archives"/>
</group>
<notebook>
<page string="Mail Body">
diff --git
a/addons/mass_mailing/wizard/mail_compose_message.py
b/addons/mass_mailing/wizard/mail_compose_message.py
index
5f9bcc2
..
de3f6e6
100644
(file)
--- 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