From 98f172c523aa74563a78fb9619d9ab05a5e63e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 16 Jul 2012 10:29:51 +0200 Subject: [PATCH] [IMP] mail: composition form: removed default body_html; bzr revid: tde@openerp.com-20120716082951-gpn3x9vr514j0a3r --- addons/mail/wizard/mail_compose_message.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index e4e8597cadb..b68d7d22040 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -137,7 +137,7 @@ class mail_compose_message(osv.TransientModel): 'model': model, 'res_id': res_id, 'email_from': user.user_email or tools.config.get('email_from', False), - 'body_html': '
---
' + tools.ustr(user.signature or ''), + 'body_html': '', }) return result @@ -200,8 +200,9 @@ class mail_compose_message(osv.TransientModel): sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else '' sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))} body_text = message_data.body_text or '' + body_html = message_data.body_html or '' quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '') - quoted_body_html = '> %s' % tools.ustr(body_text.replace('\n', "
> ") or '') + quoted_body_html = '\n
%s
' % (body_html), reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature) reply_body_html = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_html, current_user.signature) # form dest_partner_ids