summaryrefslogtreecommitdiff
path: root/addons/mail/wizard/mail_compose_message_view.xml
diff options
context:
space:
mode:
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>2012-11-02 15:54:29 +0530
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>2012-11-02 15:54:29 +0530
commit5fc14e25ed929dc4da670e75895ee04765c1db2b (patch)
tree48de909cf95df8cc0490dbadce26114857edf17e /addons/mail/wizard/mail_compose_message_view.xml
parentc7fa142878910a6e02a1c438b3c990f36d634e42 (diff)
parentbb2e63e67fd4980868dfed15736932909a3a03a9 (diff)
[Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121102102429-j3mkthcl2a129mvz
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
-rw-r--r--addons/mail/wizard/mail_compose_message_view.xml18
1 files changed, 6 insertions, 12 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 65d9ba935d8..5e571eb4338 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -14,22 +14,16 @@
<field name="parent_id" invisible="1"/>
<field name="content_subtype" invisible="1"/>
<!-- visible wizard -->
- <field name="subject" placeholder="Subject..."
- attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>/>
<field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
context="{'force_email':True}"
- on_change="onchange_partner_ids(partner_ids)"/>
+ on_change="onchange_partner_ids(partner_ids)" required="1"/>
+ <field name="subject" placeholder="Subject..."
+ attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
</group>
- <notebook>
- <page string="Body">
- <field name="body" nolabel="1"/>
- </page>
- <page string="Attachments">
- <field name="attachment_ids" colspan="4" nolabel="1"/>
- </page>
- </notebook>
+ <field name="body"/>
+ <field name="attachment_ids" widget="one2many_binary" blockui="0"/>
<footer>
- <button string="Send" name="send_mail" type="object" class="oe_highlight" />
+ <button string="Send" name="send_mail" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>