summaryrefslogtreecommitdiff
path: root/addons/mail/wizard/mail_compose_message_view.xml
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-06-29 14:36:18 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-06-29 14:36:18 +0200
commit6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch)
treed673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/mail/wizard/mail_compose_message_view.xml
parenta642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff)
parent37601079a987b0b20f22fff8963d22b1440b78b4 (diff)
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
-rw-r--r--addons/mail/wizard/mail_compose_message_view.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index a5daaec12af..99eb7192738 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,7 +6,12 @@
<field name="model">mail.compose.message</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Compose Email">
+ <form string="Compose Email" version="7.0">
+ <header>
+ <button name="send_mail" string="Send" type="object" class="oe_highlight" />
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
+ </header>
<group col="6" colspan="4">
<field name="model" invisible="1"/>
<field name="res_id" invisible="1"/>
@@ -28,11 +33,6 @@
<field name="attachment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
- <group col="4" colspan="4">
- <label string="" name="placeholder" colspan="1"/>
- <button icon="gtk-close" special="cancel" string="Cancel"/>
- <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
- </group>
</form>
</field>
</record>