diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-03-27 11:41:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-03-27 11:41:41 +0100 |
| commit | dc7398fdd37e6cfcd7fb7b4f8a19ce6b4807eac9 (patch) | |
| tree | 9239afe8a0f7fdb77e772af97a4ccad95c241564 /addons | |
| parent | 8250138326b101748eec0fa3bb52d1ad12359d5d (diff) | |
[IMP] mass_mailing: use_in_mass_mailing in email_template help
more clear + some explanations in form view
bzr revid: tde@openerp.com-20140327104141-xjx3xy8miw9c28gs
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mass_mailing/models/email_template.py | 2 | ||||
| -rw-r--r-- | addons/mass_mailing/views/email_template.xml | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/addons/mass_mailing/models/email_template.py b/addons/mass_mailing/models/email_template.py index e42c3b4c929..db5782c3234 100644 --- a/addons/mass_mailing/models/email_template.py +++ b/addons/mass_mailing/models/email_template.py @@ -10,7 +10,7 @@ class EmailTemplate(osv.Model): _inherit = ['email.template'] _columns = { - 'use_in_mass_mailing': fields.boolean('Available for mass mailing campaigns'), + 'use_in_mass_mailing': fields.boolean('Available for marketing and mailing'), } def action_new_mailing(self, cr, uid, ids, context=None): diff --git a/addons/mass_mailing/views/email_template.xml b/addons/mass_mailing/views/email_template.xml index e0a1454e6ae..35593478520 100644 --- a/addons/mass_mailing/views/email_template.xml +++ b/addons/mass_mailing/views/email_template.xml @@ -20,7 +20,12 @@ <field name="inherit_id" ref="email_template.email_template_form_minimal"/> <field name="arch" type="xml"> <xpath expr="//field[@name='model_id']" position="after"> - <field name="use_in_mass_mailing"/> + <label for="use_in_mass_mailing"/> + <div> + <field name="use_in_mass_mailing"/> + <p>Choosing this option makes the template available for use +in the mailings. It will also appear in the 'Mail Templates' menu.</p> + </div> </xpath> </field> </record> @@ -32,8 +37,8 @@ <field name="arch" type="xml"> <xpath expr="//field[@name='model_id']" position="after"> <separator/> - <filter string="Available for Mass Mailing" name="use_in_mass_mailing" domain="[('use_in_mass_mailing', '=', 1)]" - help="Available for use in mass mailing campaigns"/> + <filter string="Available for Marketing and Mailing" name="use_in_mass_mailing" domain="[('use_in_mass_mailing', '=', 1)]" + help="Available for use in mass mailings"/> </xpath> </field> </record> |