pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CLEAN] email_template: cleaned modified code to lessen the diff

Browse Source 
bzr revid: tde@openerp.com-20140224135008-b43mf3fqw0ib13r6
This commit is contained in:
Thibault Delavallée
2014-02-24 14:50:08 +01:00
parent 2641d09c79
commit 47b1500c4b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/email_template/email_template.py
+5 -6
View File
@@ -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,