diff options
| author | Dharti Ratani (OpenERP) <dhr@tinyerp.com> | 2012-07-02 10:35:06 +0530 |
|---|---|---|
| committer | Dharti Ratani (OpenERP) <dhr@tinyerp.com> | 2012-07-02 10:35:06 +0530 |
| commit | a1b98b37a90dacfea2129b93b96d1354d46bd6a2 (patch) | |
| tree | 40a9f91ac6adb28a37bd1fece570ce90a5f0b534 /addons/mail/wizard/mail_compose_message_view.xml | |
| parent | 2cea76a9828788bc027f1de183ae52b6c0344a09 (diff) | |
| parent | 9c9141cc65892d2fc28f0b26bbd2acd40fff69c4 (diff) | |
[IMP]merge with latest trunk
bzr revid: dhr@tinyerp.com-20120702050506-5vfw6o0ahrbbof5g
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index d559d679c8b..99eb7192738 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data> <record model="ir.ui.view" id="email_compose_message_wizard_form"> <field name="name">mail.compose.message.form</field> <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> @@ -47,14 +47,14 @@ <field name="target">new</field> </record> - <!-- Replace the default mass-mailing wizard in base with the composition wizard --> - <act_window name="Mass Mailing" - res_model="mail.compose.message" - src_model="res.partner" - view_mode="form" - target="new" - key2="client_action_multi" - id="base.action_partner_mass_mail" - context="{'mail.compose.message.mode':'mass_mail'}"/> - </data> + <!-- Replace the default mass-mailing wizard in base with the composition wizard --> + <act_window name="Mass Mailing" + res_model="mail.compose.message" + src_model="res.partner" + view_mode="form" + target="new" + key2="client_action_multi" + id="base.action_partner_mass_mail" + context="{'mail.compose.message.mode':'mass_mail'}"/> + </data> </openerp> |