diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
| commit | 6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch) | |
| tree | d673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/email_template/wizard | |
| parent | a642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff) | |
| parent | 37601079a987b0b20f22fff8963d22b1440b78b4 (diff) | |
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/email_template/wizard')
| -rw-r--r-- | addons/email_template/wizard/email_compose_message_view.xml | 17 | ||||
| -rw-r--r-- | addons/email_template/wizard/email_template_preview_view.xml | 5 |
2 files changed, 8 insertions, 14 deletions
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml index cf233b20682..efe0074b313 100644 --- a/addons/email_template/wizard/email_compose_message_view.xml +++ b/addons/email_template/wizard/email_compose_message_view.xml @@ -9,18 +9,17 @@ <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/> <field name="arch" type="xml"> <data> - <xpath expr="//label[@name='placeholder']" position="before"> + <xpath expr="//form/header/button" position="before"> + <field name="use_template" invisible="1"/> + <button icon="gtk-paste" type="object" name="template_toggle" + string="" help="Use a message template" /> + <button icon="gtk-save" type="object" name="save_as_template" + string="" help="Save as a new template"/> + </xpath> + <xpath expr="//form/notebook" position="after"> <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4"> <field name="template_id" colspan="3" on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/> - <label string="" name="flexspace" colspan="1"/> - </group> - <group colspan="1" col="6"> - <field name="use_template" invisible="1"/> - <button icon="gtk-paste" type="object" name="template_toggle" - string="" help="Use a message template" colspan="1"/> - <button icon="gtk-save" type="object" name="save_as_template" - string="" help="Save as a new template" colspan="1"/> </group> </xpath> </data> diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml index 7c8b5d4ff03..a7c37e9b5a9 100644 --- a/addons/email_template/wizard/email_template_preview_view.xml +++ b/addons/email_template/wizard/email_template_preview_view.xml @@ -28,11 +28,6 @@ </notebook> </group> <field name="report_name" colspan="4" readonly="1"/> - <separator colspan="4"/> - <group col="4" colspan="4"> - <label string=""/> - <button icon="gtk-ok" special="cancel" string="Close" colspan="1"/> - </group> </form> </field> </record> |