From eb722dc25a21ea3f94ed5b586ef059628977bf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 10 Dec 2013 14:39:34 +0100 Subject: [FIX] mass_mailing: fixed model used for the mass mailing itself when creating a new wave. It was receiving active_model aka mass.mailing.create instead of the correct target model (ex res.partner when mailing partners). Also updated a field string to be clearer. bzr revid: tde@openerp.com-20131210133934-xtydu43fkh7htxdg --- addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py') diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py index 9ea0d8aa1c5..4359d6c3e7b 100644 --- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py +++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py @@ -36,7 +36,7 @@ class MailMassMailingCreate(osv.TransientModel): required=True, ), 'model_id': fields.many2one( - 'ir.model', 'Document', + 'ir.model', 'Document Type', required=True, help='Document on which the mass mailing will run. This must be a ' 'valid OpenERP model.', @@ -116,6 +116,7 @@ class MailMassMailingCreate(osv.TransientModel): 'default_template_id': wizard.template_id.id, 'default_use_mass_mailing_campaign': True, 'default_use_active_domain': True, + 'default_model': wizard.model_id.model, 'default_active_domain': wizard.domain, 'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id, 'default_mass_mailing_id': wizard.mass_mailing_id.id, -- cgit v1.2.3 From 803068808425a89e2e1351218b5833cc72a0c947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Dec 2013 11:00:41 +0100 Subject: [FIX] mass_mailing: opening the composer when sending a new wave should not have the res_id linked to the campaign. As we are working with mass mailing, it should be False; ids will come from active_ids / active_domain. bzr revid: tde@openerp.com-20131219100041-85mbafgk05u8naud --- addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py') diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py index 4359d6c3e7b..0944e89f1de 100644 --- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py +++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py @@ -117,6 +117,7 @@ class MailMassMailingCreate(osv.TransientModel): 'default_use_mass_mailing_campaign': True, 'default_use_active_domain': True, 'default_model': wizard.model_id.model, + 'default_res_id': False, 'default_active_domain': wizard.domain, 'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id, 'default_mass_mailing_id': wizard.mass_mailing_id.id, -- cgit v1.2.3