odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mail: composition form: removed default body_html; 

bzr revid: tde@openerp.com-20120716082951-gpn3x9vr514j0a3r
This commit is contained in:
Thibault Delavallée 2012-07-16 10:29:51 +02:00
parent 909794d3fc
commit 98f172c523
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/mail/wizard/mail_compose_message.py
View File

@ -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': '<br />---<br />' + 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', "<br />&gt; ") or '')
quoted_body_html = '\n<blockquote>%s</blockquote>' % (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