odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] remove redundancy in ir_values.set 

bzr revid: xmo@openerp.com-20101109132137-nmkg6uc5sdqovu1o
This commit is contained in:
Xavier Morel 2010-11-09 14:21:37 +01:00
parent 05b8774c61
commit bc156c64e4
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/addons/base/ir/ir_values.py
View File

@ -114,25 +114,19 @@ class ir_values(osv.osv):
else:
res_id=False
if replace:
search_criteria = [
('key', '=', key),
('key2', '=', key2),
('model', '=', model),
('res_id', '=', res_id),
('user_id', '=', preserve_user and uid)
]
if key in ('meta', 'default'):
ids = self.search(cr, uid, [
('key', '=', key),
('key2', '=', key2),
('name', '=', name),
('model', '=', model),
('res_id', '=', res_id),
('user_id', '=', preserve_user and uid)
])
search_criteria.append(('name', '=', name))
else:
ids = self.search(cr, uid, [
('key', '=', key),
('key2', '=', key2),
('value', '=', value),
('model', '=', model),
('res_id', '=', res_id),
('user_id', '=', preserve_user and uid)
])
self.unlink(cr, uid, ids)
search_criteria.append(('value', '=', value))
self.unlink(cr, uid, self.search(cr, uid, search_criteria))
vals = {
'name': name,
'value': value,