diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index e41fccfe682..4777b7ea4f0 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -19,7 +19,7 @@
ir.ui.menu
tree
-
+ [('parent_id', '=', False)]
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index c649b12cf99..53c9fb7e580 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -324,12 +324,25 @@
-
+
+ ir.actions.wizard.tree
+ ir.actions.wizard
+ tree
+
+
+
+
+
+
+
+
+
+
ir.actions.wizard
ir.actions.wizard
form
-
- Wizard
+ Wizards
ir.actions.act_window
ir.actions.wizard
form
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 544bd9b3fee..e0da8d38945 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -602,6 +602,9 @@ class function(_column):
if store:
self._classic_read = True
self._classic_write = True
+ if type=='binary':
+ self._symbol_get=lambda x:x and str(x)
+
if type == 'float':
self._symbol_c = float._symbol_c
self._symbol_f = float._symbol_f
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index ddf0393e910..501dd285f27 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -613,7 +613,7 @@ class report_sxw(report_rml):
else:
ir_menu_report_obj = pool.get('ir.ui.menu')
report_menu_ids = ir_menu_report_obj.search(cr, uid,
- [('id', '=', ids)], context=context)
+ [('id', 'in', ids)], context=context)
if report_menu_ids:
report_name = ir_menu_report_obj.browse(cr, uid, report_menu_ids[0],
context=context)
diff --git a/bin/sql_db.py b/bin/sql_db.py
index 335a0950c13..3f4e23cc392 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -213,15 +213,15 @@ class PoolManager(object):
logger = netsvc.Logger()
try:
logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Connecting to %s' % (db_name,))
- PoolManager._pools[db_name] = ConnectionPool(ThreadedConnectionPool(0, PoolManager.maxconn, PoolManager.dsn(db_name)), db_name)
+ PoolManager._pools[db_name] = ConnectionPool(ThreadedConnectionPool(1, PoolManager.maxconn, PoolManager.dsn(db_name)), db_name)
except Exception, e:
- logger.notifyChannel('dbpool', netsvc.LOG_CRITICAL, 'Unable to connect to %s: %r' % (db_name, e))
+ logger.notifyChannel('dbpool', netsvc.LOG_CRITICAL, 'Unable to connect to %s: %s' % (db_name, e.message))
raise
return PoolManager._pools[db_name]
get = staticmethod(get)
def close(db_name):
- if db_name is PoolManager._pools:
+ if db_name in PoolManager._pools:
logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Closing all connections to %s' % (db_name,))
PoolManager._pools[db_name].closeall()
del PoolManager._pools[db_name]