Fix set default value
bzr revid: ced-bea74b99ae3b474023ddb8c5d219b7f8e5fbce26
This commit is contained in:
parent
a9d229d66f
commit
54e23b779b
|
@ -58,7 +58,7 @@ class ir_values(osv.osv):
|
||||||
else:
|
else:
|
||||||
res_id=False
|
res_id=False
|
||||||
if replace:
|
if replace:
|
||||||
ids = self.search(cr, uid, [('key','=',key),('key2','=',key2),('name','=',name),('model','=',model),('res_id','=',res_id)])
|
ids = self.search(cr, uid, [('key','=',key),('key2','=',key2),('name','=',name),('model','=',model),('res_id','=',res_id), ('user_id','=',preserve_user and uid)])
|
||||||
self.unlink(cr, uid, ids)
|
self.unlink(cr, uid, ids)
|
||||||
vals = {
|
vals = {
|
||||||
'name': name,
|
'name': name,
|
||||||
|
@ -75,9 +75,6 @@ class ir_values(osv.osv):
|
||||||
ids_res.append(self.create(cr, uid, vals))
|
ids_res.append(self.create(cr, uid, vals))
|
||||||
return ids_res
|
return ids_res
|
||||||
|
|
||||||
#
|
|
||||||
# Improve to add user_id check
|
|
||||||
#
|
|
||||||
def get(self, cr, uid, key, key2, models, meta=False, context={}, res_id_req=False, without_user=True, key2_req=True):
|
def get(self, cr, uid, key, key2, models, meta=False, context={}, res_id_req=False, without_user=True, key2_req=True):
|
||||||
result = []
|
result = []
|
||||||
for m in models:
|
for m in models:
|
||||||
|
@ -111,8 +108,8 @@ class ir_values(osv.osv):
|
||||||
else:
|
else:
|
||||||
where1.append('res_id=%d' % (res_id,))
|
where1.append('res_id=%d' % (res_id,))
|
||||||
|
|
||||||
if not without_user:
|
# if not without_user:
|
||||||
where_opt.append('user_id=%d' % (uid,))
|
where_opt.append('user_id=%d' % (uid,))
|
||||||
|
|
||||||
result = []
|
result = []
|
||||||
ok = True
|
ok = True
|
||||||
|
|
Loading…
Reference in New Issue