diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-12-24 16:43:40 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-12-24 16:43:40 +0100 |
| commit | a42bf998e24eab8fcf498a831c2f49638cd4e4d2 (patch) | |
| tree | ff2f3d73159b31a045c603836f9d43f50d133a16 /addons/mass_mailing/wizard | |
| parent | 90ebde3676b3f4c2a00132313417410ce4ba36b9 (diff) | |
| parent | e453001a7fccb1760cc9b9b85e935a45442886b5 (diff) | |
[MERGE] sync with trunk
bzr revid: mat@openerp.com-20131224154340-pwtp292xac5eodci
Diffstat (limited to 'addons/mass_mailing/wizard')
| -rw-r--r-- | addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py | 1 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml | 1 |
2 files changed, 2 insertions, 0 deletions
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, diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml index ac313dea78b..b2b48fb8618 100644 --- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml +++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml @@ -75,6 +75,7 @@ <field name="view_type">form</field> <field name="view_mode">form</field> <field name="target">new</field> + <field name="context">{'default_mass_mailing_campaign_id': active_id}</field> </record> </data> |