From d8f91951f91d69be8ea121634205ef1bb7ff6eb8 Mon Sep 17 00:00:00 2001 From: "Nch (OpenERP)" <> Date: Wed, 23 Dec 2009 11:10:05 +0530 Subject: [PATCH 1/3] [FIX] quality_integration_server: if db exits, first drop db on create db command bzr revid: hmo@tinyerp.com-20091223054005-b70d4cupfeomi1ht --- .../base_quality_interrogation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py index 8806ff0e2b9..96c04e72ca6 100755 --- a/bin/addons/quality_integration_server/base_quality_interrogation.py +++ b/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') From f0d67e836949113e0bab499ab731494af5c5ba5f Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 23 Dec 2009 12:16:55 +0530 Subject: [PATCH 2/3] [FIX] Integer widget : improvements when functional integer field returns big value lp bug: https://launchpad.net/bugs/416821 fixed bzr revid: jvo@tinyerp.com-20091223064655-ssk404pl46271rdj --- bin/osv/fields.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index 2c7378ea6a1..f56f700596c 100644 --- a/bin/osv/fields.py +++ b/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 From 9b00c7f52e84f88be58ce090057a97ecbc75442d Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Wed, 23 Dec 2009 14:50:03 +0100 Subject: [PATCH 3/3] [IMP] Extend expression field to use multiple condition with context bzr revid: christophe.chauvet@syleam.fr-20091223135003-mr81x59n00vmdbas --- bin/addons/base/res/res_company.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index 2635c613698..3306e85a0f4 100644 --- a/bin/addons/base/res/res_company.py +++ b/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'), }