summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-08-22 09:20:25 +0200
committerRaphael Collet <rco@openerp.com>2014-08-22 09:23:42 +0200
commit48dfd70b4a2f862da49e5db9b564cc28bd1103b8 (patch)
tree92baf31b64b51284529975923653fb3bcc23903c
parent80d8532370edaede60e51712467535cdac1f58ec (diff)
[IMP] osv/fields.py: improve code change of rev eea07e27
-rw-r--r--openerp/osv/fields.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index b04b9c037d3..20f651e37d1 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1566,12 +1566,8 @@ class property(function):
column = obj._all_columns[prop_name].column
values = ir_property.get_multi(cr, uid, prop_name, obj._name, ids, context=context)
if column._type == 'many2one':
- # name_get the values as SUPERUSER_ID
- vals = None
- for v in values.itervalues():
- if v:
- vals = v if not vals else (vals | v)
-
+ # name_get the non-null values as SUPERUSER_ID
+ vals = sum(set(filter(None, values.itervalues())))
vals_name = dict(vals.sudo().name_get()) if vals else {}
for id, value in values.iteritems():
ng = False