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 | |
| 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')
| -rw-r--r-- | addons/email_template/email_template_account_view.xml | 9 | ||||
| -rw-r--r-- | addons/email_template/email_template_view.xml | 20 | ||||
| -rwxr-xr-x | addons/email_template/wizard/email_template_send_wizard.py | 1 |
3 files changed, 15 insertions, 15 deletions
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index 9a35328b25c..4a35134bb41 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -2,8 +2,9 @@ <openerp> <data> - <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/> - <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/> + <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/> + <menuitem name="Emails" id="base.menu_emails" parent="base.menu_tools" sequence="5"/> + <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/> <record model="ir.ui.view" id="email_template_account_form"> <field name="name">email_template.account.form</field> @@ -95,7 +96,9 @@ <field name="search_view_id" ref="view_email_template_account_search"/> </record> - <menuitem name="Configuration" id="menu_email_template_configuration" parent="menu_email_template" /> + <menuitem name="Configuration" parent="base.menu_tools" + id="base.menu_lunch_survey_root" sequence="20"/> + <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" /> <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/> 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> diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py index 7d27eab9adf..9934336d506 100755 --- a/addons/email_template/wizard/email_template_send_wizard.py +++ b/addons/email_template/wizard/email_template_send_wizard.py @@ -168,7 +168,6 @@ class email_template_send_wizard(osv.osv_memory): mail_ids = [] template = self._get_template(cr, uid, context) for id in context['src_rec_ids']: - print "@22222222222222222222222",ids screen_vals = self.read(cr, uid, ids[0], [],context) account = self.pool.get('email_template.account').read(cr, uid, screen_vals['from'], context=context) vals = { |