openerp-dev-web team mailing list archive

["Ysa\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Ysa(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/ysa-trunk-server into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #698023 null value in column "categ_id" violates
  https://bugs.launchpad.net/bugs/698023

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/ysa-trunk-server/+merge/45351

https://bugs.launchpad.net/openobject-server/+bug/695960
[FIX] use tools.ustr function instead of encoding of xsl report in interface.py

https://bugs.launchpad.net/openobject-server/+bug/698023
[FIX] display simple error instead of traceback in sql bad query.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/ysa-trunk-server/+merge/45351
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/ysa-trunk-server.

=== modified file 'bin/report/interface.py'
--- bin/report/interface.py	2011-01-04 10:13:35 +0000
+++ bin/report/interface.py	2011-01-06 11:41:38 +0000
@@ -39,7 +39,7 @@
     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('&', '&amp;').replace('<','&lt;').replace('>','&gt;')

=== modified file 'bin/sql_db.py'
--- bin/sql_db.py	2010-11-30 11:09:40 +0000
+++ bin/sql_db.py	2011-01-06 11:41:38 +0000
@@ -133,7 +133,7 @@
             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: