[MERGE]

bzr revid: nch@tinyerp.com-20100208062422-e9kn8fktnu7c3h9l
bzr revid: nch@tinyerp.com-20100209044752-ti7ai0yt4umfmos8

bin/addons/base/res/res_user.py

@@ -26,6 +26,7 @@ import pytz
 import pooler
 from tools.translate import _
 from service import security
+import netsvc
 
 class groups(osv.osv):
     _name = "res.groups"

bin/addons/quality_integration_server/base_quality_interrogation.py

@@ -174,28 +174,7 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
     if dbname in db_list:
         drop_db(uri, dbname)
     id = execute(conn,'create',admin_passwd, dbname, True, lang)
-    wait(id,uri)
-    uid = login_conn.login(dbname, user, pwd)
-
-    wiz_id = execute(wiz_conn,'create', dbname, uid, user, 'base_setup.base_setup')
-
-    state = 'init'
-    datas = {'form':{}}
-
-    while state!='config':
-        res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
-        if state=='init':
-            datas['form'].update( res['datas'] )
-        if res['type']=='form':
-            for field in res['fields'].keys():
-                datas['form'][field] = datas['form'].get(field,False)
-            state = res['state'][-1][0]
-            datas['form'].update({
-                'profile': -1
-            })
-        elif res['type']=='state':
-            state = res['state']
-    res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+    wait(id,uri)    
     install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
     return True
 

bin/tools/convert.py

@@ -740,7 +740,10 @@ form: module.record_id""" % (xml_id,)
         if '.' in id_str:
             mod,id_str = id_str.split('.')
         result = self.pool.get('ir.model.data')._get_id(cr, self.uid, mod, id_str)
-        return int(self.pool.get('ir.model.data').read(cr, self.uid, [result], ['res_id'])[0]['res_id'])
+        res = self.pool.get('ir.model.data').read(cr, self.uid, [result], ['res_id'])
+        if res and res[0] and res[0]['res_id']:
+            return int(res[0]['res_id'])
+        return False
 
     def parse(self, de):
         if not de.tag in ['terp', 'openerp']: