merge

bzr revid: fp@tinyerp.com-20091223162425-mqln7j5micm3yu43

bin/addons/base/res/res_company.py

@@ -43,8 +43,8 @@ class multi_company_default(osv.osv):
             help='Company to store the current record'),
         'object_id': fields.many2one('ir.model', 'Object', required=True,
             help='Object affect by this rules'),
-        'expression': fields.char('Expression', size=32, required=True,
-            help='Expression, must be True to match'),
+        'expression': fields.char('Expression', size=256, required=True,
+            help='Expression, must be True to match\nuse context.get or user (browse)'),
         'field_id': fields.many2one('ir.model.fields', 'Field', help='Select field property'),
     }
 

bin/addons/quality_integration_server/base_quality_interrogation.py

@@ -171,9 +171,10 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
     wiz_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
     login_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
     db_list = execute(conn, 'list')
-    if dbname not in db_list:
-        id = execute(conn,'create',admin_passwd, dbname, True, lang)
-        wait(id,uri)
+    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')

bin/osv/fields.py

@@ -679,6 +679,10 @@ class function(_column):
         if self._type == 'binary' and context.get('bin_size', False):
             # convert the data returned by the function with the size of that data...
             res = dict(map( get_nice_size, res.items()))
+        if self._type == "integer":
+            for r in res.keys():
+                # Converting value into string so that it does not affect XML-RPC Limits
+                res[r] = str(res[r])
         return res
     get_memory = get