From 50462d4296f21ba932dd5b38319a6e7182da60ce Mon Sep 17 00:00:00 2001 From: Yogesh Sakhreliya Date: Tue, 4 Jan 2011 15:30:59 +0530 Subject: [PATCH 1/3] [FIX] use ustr function instead of encoding in xsl report. lp bug: https://launchpad.net/bugs/695960 fixed bzr revid: ysa@tinyerp.com-20110104100059-55eydjnmtd22saed --- bin/report/interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/report/interface.py b/bin/report/interface.py index 16dfafe0a18..3e710db9660 100644 --- a/bin/report/interface.py +++ b/bin/report/interface.py @@ -39,7 +39,7 @@ def toxml(val): if isinstance(val, str): str_utf8 = val elif isinstance(val, unicode): - str_utf8 = val.encode('utf-8') + str_utf8 = tools.ustr(val) else: str_utf8 = str(val) return str_utf8.replace('&', '&').replace('<','<').replace('>','>') From d0c25a2c23f222534f97e4451507cad2744ffe81 Mon Sep 17 00:00:00 2001 From: Yogesh Sakhreliya Date: Thu, 6 Jan 2011 16:53:17 +0530 Subject: [PATCH 2/3] [FIX] display simple error instead of traceback in sql bad query. bzr revid: ysa@tinyerp.com-20110106112317-0mj9v7n8n133af29 --- bin/sql_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sql_db.py b/bin/sql_db.py index aed10423bb7..b9b72023980 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -133,7 +133,7 @@ class Cursor(object): raise except Exception: if log_exceptions or self.sql_log: - self.__logger.exception("bad query: %s", self._obj.query or query) + self.__logger.error("bad query: %s", self._obj.query or query) raise if self.sql_log: From fcf7c478cc18bd50530d94a56fc17d4edb0f01dd Mon Sep 17 00:00:00 2001 From: "YSA (Openerp)" Date: Thu, 20 Jan 2011 11:10:34 +0530 Subject: [PATCH 3/3] [FIX] call name_search method then pass context parameter in import_data method.. bzr revid: ysa@tinyerp.com-20110120054034-b8mdwsev5ax5c2cj --- bin/osv/orm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 89b93c41923..1b6c9358e7a 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -728,7 +728,7 @@ class orm_template(object): id = ir_model_data[0]['res_id'] else: obj_model = self.pool.get(model_name) - ids = obj_model.name_search(cr, uid, id, operator='=') + ids = obj_model.name_search(cr, uid, id, operator='=', context=context) if not ids: raise ValueError('No record found for %s' % (id,)) id = ids[0][0]