pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix default value to not use value from other users

Browse Source 
bzr revid: ced-5e68190c58fb3d4c2809c8246aea732d5902ceac
This commit is contained in:
ced
2007-09-20 08:48:17 +00:00
parent 5d9eeb78e4
commit 3ab62add80
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir_values.py
+12 -8
View File
@@ -115,13 +115,12 @@ class ir_values(osv.osv):
where1.append('res_id=%d' % (res_id,))
else:
where1.append('(res_id is NULL)')
else:
if res_id:
if (models[-1][0]==m):
where1.append('(res_id=%d or (res_id is null))' % (res_id,))
where_opt.append('res_id=%d' % (res_id,))
else:
where1.append('res_id=%d' % (res_id,))
elif res_id:
if (models[-1][0]==m):
where1.append('(res_id=%d or (res_id is null))' % (res_id,))
where_opt.append('res_id=%d' % (res_id,))
else:
where1.append('res_id=%d' % (res_id,))
# if not without_user:
where_opt.append('user_id=%d' % (uid,))
@@ -130,7 +129,12 @@ class ir_values(osv.osv):
result = []
ok = True
while ok and len(result)==0:
cr.execute('select id from ir_values where '+' and '.join(where1+where_opt), where2)
if not where_opt:
cr.execute('select id from ir_values where ' +\
' and '.join(where1)+' and user_id is null', where2)
else:
cr.execute('select id from ir_values where ' +\
' and '.join(where1+where_opt), where2)
result = [x[0] for x in cr.fetchall()]
if len(where_opt):
where_opt.pop()