summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/wizard/mail_compose_message.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2014-04-14 16:40:11 +0200
committerThibault Delavallée <tde@openerp.com>2014-04-14 16:40:11 +0200
commit48d7a6fa6ca13208ca6468eaee127092fec60c78 (patch)
treeef08eeca2c9f6f1b5a8e90360bd7a1150ead2f3c /addons/mass_mailing/wizard/mail_compose_message.py
parent55266ab25d45a4290d842f449449d9687ab898ce (diff)
[CLEAN] mass_mailing: rmeoved dead stuff
bzr revid: tde@openerp.com-20140414144011-awu4g35etq9s4gje
Diffstat (limited to 'addons/mass_mailing/wizard/mail_compose_message.py')
-rw-r--r--addons/mass_mailing/wizard/mail_compose_message.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index b10cafdcc4e..20a2c217d8b 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -50,16 +50,6 @@ class MailComposeMessage(osv.TransientModel):
if wizard.composition_mode == 'mass_mail' and \
(wizard.mass_mailing_name or wizard.mass_mailing_id) and \
wizard.model in [item[0] for item in self.pool['mail.mass_mailing']._get_mailing_model(cr, uid, context=context)]:
- # list_ids = None
- # if wizard.mailing_list_ids:
- # list_ids = [l.id for l in wizard.mailing_list_ids]
- # if not list_ids:
- # list_ids = [self.pool['mail.mass_mailing.list'].create(
- # cr, uid, {
- # 'name': wizard.mass_mailing_name,
- # 'model': wizard.model,
- # 'domain': wizard.active_domain,
- # }, context=context)]
mass_mailing = wizard.mass_mailing_id
if not mass_mailing:
mass_mailing_id = self.pool['mail.mass_mailing'].create(
@@ -69,7 +59,7 @@ class MailComposeMessage(osv.TransientModel):
'template_id': wizard.template_id and wizard.template_id.id or False,
'state': 'done',
'mailing_type': wizard.model,
- # 'contact_list_ids': [(4, list_id) for list_id in list_ids],
+ 'mailing_domain': wizard.active_domain,
}, context=context)
mass_mailing = self.pool['mail.mass_mailing'].browse(cr, uid, mass_mailing_id, context=context)
recipient_values = self.pool['mail.mass_mailing'].get_recipients_data(cr, uid, mass_mailing, res_ids, context=context)