From 47b1500c4b359b61078d401c0c0dcebbea01f869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 24 Feb 2014 14:50:08 +0100 Subject: [PATCH] [CLEAN] email_template: cleaned modified code to lessen the diff bzr revid: tde@openerp.com-20140224135008-b43mf3fqw0ib13r6 --- addons/email_template/email_template.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 5167bdc3d79..c5b2083d1c8 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -363,12 +363,11 @@ class email_template(osv.osv): # update values for all res_ids for res_id in template_res_ids: values = results[res_id] - if 'body_html' in fields: - if template.user_signature: - signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature - values['body_html'] = tools.append_content_to_html(values['body_html'], signature) - if values['body_html']: - values['body'] = tools.html_sanitize(values['body_html']) + if 'body_html' in fields and template.user_signature: + signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature + values['body_html'] = tools.append_content_to_html(values['body_html'], signature) + if values.get('body_html'): + values['body'] = tools.html_sanitize(values['body_html']) values.update( mail_server_id=template.mail_server_id.id or False, auto_delete=template.auto_delete,