diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-06 14:57:00 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-06 14:57:00 +0100 |
| commit | 49c0b7a82003a889edc19cb189d0d6d0ebda2c5f (patch) | |
| tree | d24c9d3fe3baad3ba06f11d4bf334e2504fb6092 /addons/mass_mailing | |
| parent | c4c268c902a134efdf0f097053c9b28d6b14417c (diff) | |
| parent | ced63415b7319e12fb9d31a3e370850278f697c1 (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
Diffstat (limited to 'addons/mass_mailing')
4 files changed, 10 insertions, 5 deletions
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py index b8ca21c60d7..92f8b1fc3e8 100644 --- a/addons/mass_mailing/__openerp__.py +++ b/addons/mass_mailing/__openerp__.py @@ -38,9 +38,9 @@ professional emails and reuse templates in a few clicks. ], 'data': [ 'mail_data.xml', - 'mass_mailing_view.xml', 'wizard/mail_compose_message_view.xml', 'wizard/mail_mass_mailing_create_segment.xml', + 'mass_mailing_view.xml', 'security/ir.model.access.csv', ], 'js': [ diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml index f0c27f42a4a..c9594179a72 100644 --- a/addons/mass_mailing/mass_mailing_view.xml +++ b/addons/mass_mailing/mass_mailing_view.xml @@ -252,6 +252,9 @@ <t t-if="widget.view.is_action_enabled('edit')"> <li><a type="edit">Settings</a></li> </t> + <t t-if="widget.view.is_action_enabled('edit')"> + <li><a name="%(action_mail_mass_mailing_create)d" type="action">New Wave</a></li> + </t> <t t-if="widget.view.is_action_enabled('delete')"> <li><a type="delete">Delete</a></li> </t> 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..0944e89f1de 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,8 @@ 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_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 e307bdd8909..b2b48fb8618 100644 --- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml +++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml @@ -42,7 +42,7 @@ </p> </div> - <label for="model_id"/> + <label for="template_id"/> <div> <field name="template_id"/> <p class="oe_grey" @@ -55,8 +55,7 @@ <label for="name"/> <div> <field name="name"/> - <p class="oe_grey" - attrs="{'invisible': [('name', '!=', False)]}"> + <p class="oe_grey"> Please choose the name of the mailing. </p> </div> @@ -76,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> |