diff options
| author | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
|---|---|---|
| committer | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
| commit | b0efd26edd9f4e2aa75424b787ea46d2be15cd04 (patch) | |
| tree | e78cdb693e62a5c9a17f77a395eec51fb34becbf /addons/email_template/email_template_view.xml | |
| parent | 46bb1ea51be702758d68a5f69db32c82dbccf9bd (diff) | |
| parent | 2319190c5a20cb8095f85cacca89a33164ba93d7 (diff) | |
[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy
Diffstat (limited to 'addons/email_template/email_template_view.xml')
| -rw-r--r-- | addons/email_template/email_template_view.xml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 0faa28e042f..934a7324b07 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -20,19 +20,17 @@ <newline /> <field name="subject" /> <newline /> - <field name="body_text" /> - <newline /> - <!-- <field name="body_html" widget="text_html" />--> - <!-- - Removed text_html because it doesnt work in GTK - And TinyMCE messes up the HTML in Web Client - --> - <field name="body_html"/> + <separator string= "Body(Text)" colspan="2"/> + <newline/> + <field name="body_text" nolabel="1" colspan="2"/> + <newline/> + <separator string= "Body(Html)" colspan="2"/> + <newline/> + <field name="body_html" nolabel="1" colspan="2"/> <newline /> <field name="report" /> - <group> - <button icon="gtk-ok" special="cancel" string="OK" /> - </group> + <newline/> + <button icon="gtk-ok" special="cancel" string="OK" colspan="2"/> </form> </field> </record> |