[MERGE] Merged the branch for the fix of case 4527

bzr revid: jvo@tinyerp.com-20110413182646-3burollg44tu2etv
This commit is contained in:
Jay Vora (OpenERP) 2011-04-13 23:56:46 +05:30
commit 7a45ce9e6c
1 changed files with 10 additions and 7 deletions

View File

@ -404,13 +404,16 @@ class audittrail_objects_proxy(object_proxy):
cr.close()
return res
else:
res_ids = args[0]
old_values = {}
fields = []
if len(args)>1 and type(args[1]) == dict:
fields = args[1].keys()
if type(res_ids) in (long, int):
res_ids = [res_ids]
res_ids = []
res = True
if args:
res_ids = args[0]
old_values = {}
fields = []
if len(args)>1 and type(args[1]) == dict:
fields = args[1].keys()
if type(res_ids) in (long, int):
res_ids = [res_ids]
if res_ids:
for resource in resource_pool.read(cr, uid, res_ids):
resource_id = resource['id']