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

[FIX] Send Mail : Unicode error handled 

lp bug: https://launchpad.net/bugs/421162 fixed

bzr revid: jvo@tinyerp.com-20090902145354-5b43k67lpbe513cj
This commit is contained in:
ACH(OpenERP) 2009-09-02 20:23:54 +05:30 committed by Jay (Open ERP)
parent 40666e1316
commit 460f3102bc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/tools/misc.py
View File

@ -331,7 +331,10 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
email_bcc = []
if not attach:
msg = MIMEText(body.encode('utf-8') or '',_subtype=subtype,_charset='utf-8')
try:
msg = MIMEText(body.encode('utf8') or '',_subtype=subtype,_charset='utf-8')
except:
msg = MIMEText(body or '',_subtype=subtype,_charset='utf-8')
else:
msg = MIMEMultipart()
@ -362,8 +365,10 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
msg['Message-Id'] = "<%s-tinycrm-%s@%s>" % (time.time(), tinycrm, socket.gethostname())
if attach:
msg.attach( MIMEText(body.encode('utf-8') or '', _charset='utf-8', _subtype=subtype) )
try:
msg.attach(MIMEText(body.encode('utf8') or '',_subtype=subtype,_charset='utf-8'))
except:
msg.attach(MIMEText(body or '', _charset='utf-8', _subtype=subtype) )
for (fname,fcontent) in attach:
part = MIMEBase('application', "octet-stream")
part.set_payload( fcontent )