diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-07-03 14:20:20 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-07-03 14:20:20 +0200 |
| commit | 289dad87d4aa9f5552d243f58ca4bdded389b268 (patch) | |
| tree | 68d02ead01da4d715f8259964cb45bb6b546a88d /addons/mail/wizard/mail_compose_message_view.xml | |
| parent | 7ec35818bd09283229156868c476bf719eb48a3e (diff) | |
| parent | 8e9f7b7739ffce4a89fcefce25507ef9e7363369 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120703122020-79rl9b03mygz5s0h
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 62 |
1 files changed, 24 insertions, 38 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 2d8fd2cd140..ef78ac2de08 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -1,38 +1,29 @@ <?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"> - <group col="6" colspan="4"> -<!-- + <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> <field name="model" invisible="1"/> <field name="res_id" invisible="1"/> ---> <field name='filter_id' invisible="context.get('active_model',False)"/> - <newline/> - <group colspan="4" col="4"> - <field name="email_from" colspan="4" required="1"/> - <field name="email_to" colspan="4" required="1"/> - <field name="email_cc" colspan="4"/> - <field name="email_bcc" colspan="4"/> - <field name="reply_to" colspan="4"/> - <field name="subject" colspan="4" widget="char" size="512"/> - </group> - <newline/> - <separator string="Debug information" colspan="6"/> - <field name="model"/> - <field name="res_id"/> - <newline/> + <field name="email_from" required="1"/> + <field name="email_to" required="1"/> + <field name="email_cc"/> + <field name="email_bcc"/> + <field name="reply_to"/> + <field name="subject" widget="char" size="512"/> <field name="references"/> <field name="message_id"/> -<!-- - <field name="references" invisible="1"/> - <field name="message_id" invisible="1"/> ---> </group> <notebook colspan="4"> <page string="Body"> @@ -42,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> @@ -88,14 +74,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> |