From d159aec83d3c0ae07699db808451771231abe989 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 2 May 2016 16:26:18 +0200 Subject: [PATCH] [IMP] qweb: remove decode('utf-8') in report because qweb return unicode --- addons/report/models/report.py | 4 +--- openerp/addons/base/ir/ir_qweb/qweb.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/report/models/report.py b/addons/report/models/report.py index 2af640df6a6..cee7110d7ec 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -128,7 +128,7 @@ class Report(osv.Model): 'doc_model': report.model, 'docs': docs, } - return self.render(cr, uid, [], report.report_name, docargs, context=context) + return self.render(cr, uid, [], report.report_name, docargs, context=context).encode('utf-8') @api.v8 def get_html(self, records, report_name, data=None): @@ -163,8 +163,6 @@ class Report(osv.Model): if isinstance(cr, TestCursor): return html - html = html.decode('utf-8') # Ensure the current document is utf-8 encoded. - # Get the ir.actions.report.xml record we are working on. report = self._get_report_from_name(cr, uid, report_name) # Check if we have to save the report or if we have to get one from the db. diff --git a/openerp/addons/base/ir/ir_qweb/qweb.py b/openerp/addons/base/ir/ir_qweb/qweb.py index 8e6452b0fa8..b6ae1f8856e 100644 --- a/openerp/addons/base/ir/ir_qweb/qweb.py +++ b/openerp/addons/base/ir/ir_qweb/qweb.py @@ -93,7 +93,7 @@ class QWeb(models.AbstractModel): if method.startswith('render_'): _logger.warning("Method '%s' found in ir.qweb, please remove it." % method) - return template_function(qwebcontext).encode('utf-8') + return template_function(qwebcontext) def get_field_for(self, field_type, cr=None, uid=None, context=None): """ returns a :class:`~openerp.models.Model` used to render a