diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-09-10 14:47:54 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-09-10 14:47:54 +0200 |
| commit | c063f54691a5726a8ab90d273a70fe46bdaff844 (patch) | |
| tree | b8cd5e3a44d9e95d1ef6066c80e301e489084f6d /addons/mail/wizard/mail_compose_message_view.xml | |
| parent | 43bfef6918f7947c2733cb4f0e93cff480360040 (diff) | |
[IMP] mail: in mass mail mode, default value is now to send emails, not to perform a mass post on documents.
bzr revid: tde@openerp.com-20130910124754-jssus6l43nil4qad
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index ed1a211ce8c..ff1dd96229e 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -14,20 +14,11 @@ <field name="parent_id" invisible="1"/> <field name="mail_server_id" invisible="1"/> <field name="use_active_domain" invisible="1"/> - <field name="active_domain" invisible="1"/> <!-- visible wizard --> <field name="email_from" attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> <field name="subject" placeholder="Subject..." required="True"/> - <field name="post" - attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> - <field name="notify" - attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/> - <field name="same_thread" - attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> - <field name="reply_to" placeholder="Email address te redirect replies..." - attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')], - 'required':[('same_thread', '!=', True)]}"/> + <!-- classic message composer --> <label for="partner_ids" string="Recipients" attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"/> <div groups="base.group_user" @@ -40,6 +31,19 @@ <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..." context="{'force_email':True, 'show_email':True}"/> </div> + <!-- mass post / mass mailing --> + <field name="active_domain" + attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')], + 'readonly': True}"/> + <field name="post" + attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> + <field name="notify" + attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/> + <field name="same_thread" + attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> + <field name="reply_to" placeholder="Email address te redirect replies..." + attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')], + 'required':[('same_thread', '!=', True)]}"/> </group> <field name="body"/> <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/> |