diff options
| author | Olivier Dony <odo@openerp.com> | 2011-04-30 03:56:46 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-04-30 03:56:46 +0200 |
| commit | a76e08077aeb0ca882a8f613b113dff9495f1a61 (patch) | |
| tree | ad14fc7359a788241989a99d57e36b1d1c5953ff /addons | |
| parent | 7c5b94ec226d8396c24d9c03d044f2fa49d6a183 (diff) | |
[FIX] report_webkit: fixed UTF-8 encoding in debug mode too
bzr revid: odo@openerp.com-20110430015646-j7y9fyv31j6euce3
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/report_webkit/data.xml | 2 | ||||
| -rw-r--r-- | addons/report_webkit/webkit_report.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data.xml index 62a76697ea5..6cc254b1451 100644 --- a/addons/report_webkit/data.xml +++ b/addons/report_webkit/data.xml @@ -9,6 +9,7 @@ <record id="ir_header_webkit_basesample0" model="ir.header_webkit"> <field name="footer_html"><![CDATA[<html> <head> + <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> <script> function subst() { var vars={}; @@ -34,6 +35,7 @@ <field eval=""""A4"""" name="format"/> <field name="html"><![CDATA[<html> <head> + <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> <script> function subst() { var vars={}; diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index f48795c34d3..406013cef12 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -42,6 +42,7 @@ import pooler from report_helper import WebKitHelper from report.report_sxw import * import addons +import tools from tools.translate import _ from osv.osv import except_osv @@ -264,6 +265,7 @@ class WebKitParser(report_sxw): header = u""" <html> <head> + <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> <style type="text/css"> ${css} </style> @@ -341,7 +343,7 @@ class WebKitParser(report_sxw): time=time, helper=helper, css=css, - _debug=html.decode(), + _debug=tools.ustr(html), formatLang=self.formatLang, setLang=self.setLang, _=self.translate_call, |