openerp-dev-web team mailing list archive

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

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

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #672886 crash system report in testing and reports
  https://bugs.launchpad.net/bugs/672886
  #675681 Configuration window : spacing issue between text and progress bar
  https://bugs.launchpad.net/bugs/675681
  #686561 Demo and Admin users share the same address by default, preventing different emails to be set
  https://bugs.launchpad.net/bugs/686561
  #695338 Assert tag contains an expr wtih wrong field of res.currency object.
  https://bugs.launchpad.net/bugs/695338

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

[FIX] workflow:- Subflow id pass in list in graph_get method.
https://bugs.launchpad.net/openobject-server/+bug/701058

-- 
https://code.launchpad.net/~openerp-dev/openobject-server/ysa-server-framework/+merge/45968
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/ysa-server-framework.

=== modified file 'bin/addons/base/ir/workflow/print_instance.py'
--- bin/addons/base/ir/workflow/print_instance.py	2010-06-24 08:45:39 +0000
+++ bin/addons/base/ir/workflow/print_instance.py	2011-01-12 09:31:14 +0000
@@ -38,7 +38,7 @@
             cr.execute('select * from wkf where id=%s', (n['subflow_id'],))
             wkfinfo = cr.dictfetchone()
             graph2 = pydot.Cluster('subflow'+str(n['subflow_id']), fontsize='12', label = """\"Subflow: %s\\nOSV: %s\"""" % ( n['name'], wkfinfo['osv']) )
-            (s1,s2) = graph_get(cr, graph2, n['subflow_id'], nested,workitem)
+            (s1,s2) = graph_get(cr, graph2, [n['subflow_id']], nested,workitem)
             graph.add_subgraph(graph2)
             actfrom[n['id']] = s2
             actto[n['id']] = s1

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2011-01-10 17:29:49 +0000
+++ bin/osv/fields.py	2011-01-12 09:31:14 +0000
@@ -762,6 +762,11 @@
             self._symbol_f = boolean._symbol_f
             self._symbol_set = boolean._symbol_set
 
+        if type in ['integer','integer_big']:
+            self._symbol_c = integer._symbol_c
+            self._symbol_f = integer._symbol_f
+            self._symbol_set = integer._symbol_set
+
     def digits_change(self, cr):
         if self.digits_compute:
             t = self.digits_compute(cr)

=== modified file 'bin/report/interface.py'
--- bin/report/interface.py	2011-01-04 10:13:35 +0000
+++ bin/report/interface.py	2011-01-12 09:31:14 +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-12 09:31:14 +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: