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

[FIX] note: small bugs

This commit is contained in:
Desai Binjal 2014-08-06 17:46:46 +05:30 committed by Richard Mathot
parent 768b3592c2
commit 8fe9f07cac
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/pad/pad.py
View File

@ -57,7 +57,7 @@ class pad_common(osv.osv_memory):
#get content of the real field
for record in model.browse(cr, uid, [context["object_id"]]):
if record[real_field]:
myPad.setText(path, html2plaintext(record[real_field]))
myPad.setText(path, (html2plaintext(record[real_field]).encode('utf-8')))
#Etherpad for html not functional
#myPad.setHTML(path, record[real_field])

3
openerp/tools/mail.py
View File

@ -213,6 +213,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
html = html.replace(' ' * 2, ' ')
html = html.replace('>', '>')
html = html.replace('&lt;', '<')
html = html.replace('&amp;', '&')
# strip all lines
html = '\n'.join([x.strip() for x in html.splitlines()])
@ -375,4 +376,4 @@ def email_split(text):
# sometimes returns emails without at least '@'. The '@'
# is strictly required in RFC2822's `addr-spec`.
if addr[1]
if '@' in addr[1]]
if '@' in addr[1]]