diff options
| author | chm@openerp.com <> | 2014-04-23 17:48:52 +0200 |
|---|---|---|
| committer | chm@openerp.com <> | 2014-04-23 17:48:52 +0200 |
| commit | ee7ff4bd07d8d84ed2ebb0e2e3f5eb437f158e5b (patch) | |
| tree | 25577845139d390f9bf27e0237d18842aeace02b /addons/mail/wizard/mail_compose_message_view.xml | |
| parent | b1bc68d8eb374f30173e03e8048d1c3588a00d4b (diff) | |
| parent | 1657ffb8e7d95ef5f94e59121737abb068371b66 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 23931649402..5b6bfc50439 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -11,6 +11,7 @@ <field name="composition_mode" invisible="1"/> <field name="model" invisible="1"/> <field name="res_id" invisible="1"/> + <field name="is_log" invisible="1"/> <field name="parent_id" invisible="1"/> <field name="mail_server_id" invisible="1"/> <!-- Various warnings --> @@ -28,29 +29,27 @@ <field name="email_from" attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> <field name="subject" placeholder="Subject..." required="True"/> - <!-- classic message composer --> - <label for="partner_ids" string="Recipients" - attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"/> - <div groups="base.group_user" - attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"> - <span attrs="{'invisible':[('model', '=', False)]}"> - Followers of - <field name="record_name" readonly="1" class="oe_inline oe_compose_recipients"/> - and + <!-- recipients --> + <label for="partner_ids" string="Recipients" attrs="{'invisible': [('is_log', '=', True)]}" groups="base.group_user"/> + <div groups="base.group_user" attrs="{'invisible': [('is_log', '=', True)]}"> + <span attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"> + <strong>Email mass mailing</strong> on + <span attrs="{'invisible': [('use_active_domain', '=', True)]}">the selected records</span> + <span attrs="{'invisible': [('use_active_domain', '=', False)]}">the current search filter</span>. </span> + <span attrs="{'invisible':[('composition_mode', '!=', 'comment')]}">Followers of the document and</span> <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..." - context="{'force_email':True, 'show_email':True}"/> + context="{'force_email':True, 'show_email':True}" + attrs="{'invisible': [('composition_mode', '!=', 'comment')]}"/> </div> - <!-- mass post / mass mailing --> - <field name="post" - attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> + <!-- mass post --> <field name="notify" - attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/> - <field name="same_thread" - attrs="{'invisible':['|', ('composition_mode', '!=', 'mass_mail'), ('post', '=', False)]}"/> - <field name="reply_to" placeholder="Email address te redirect replies..." - attrs="{'invisible':['|', '&', ('same_thread', '=', True), ('post', '=', True), ('composition_mode', '!=', 'mass_mail')], - 'required':['&', '|', ('post', '=', False), ('same_thread', '=', False), ('composition_mode', '=', 'mass_mail')]}"/> + attrs="{'invisible':['|', ('composition_mode', '!=', 'mass_post')]}"/> + <!-- mass mailing --> + <field name="same_thread" attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/> + <field name="reply_to" placeholder="Email address to redirect replies..." + attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')], + 'required':[('same_thread', '!=', True), ('composition_mode', '=', 'mass_mail')]}"/> </group> <field name="body"/> <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/> |