projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
754cbf2
)
[FIX] osv/fields.py: fix sum in rev 48dfd70
author
Raphael Collet
<rco@openerp.com>
Fri, 22 Aug 2014 08:56:07 +0000
(10:56 +0200)
committer
Raphael Collet
<rco@openerp.com>
Fri, 22 Aug 2014 08:56:07 +0000
(10:56 +0200)
openerp/osv/fields.py
patch
|
blob
|
history
diff --git
a/openerp/osv/fields.py
b/openerp/osv/fields.py
index
20f651e
..
1adbf43
100644
(file)
--- a/
openerp/osv/fields.py
+++ b/
openerp/osv/fields.py
@@
-1567,8
+1567,8
@@
class property(function):
values = ir_property.get_multi(cr, uid, prop_name, obj._name, ids, context=context)
if column._type == 'many2one':
# name_get the non-null values as SUPERUSER_ID
values = ir_property.get_multi(cr, uid, prop_name, obj._name, ids, context=context)
if column._type == 'many2one':
# 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 {}
+ vals = set(filter(None, values.itervalues()))
+ vals_name = dict(sum(vals).sudo().name_get()) if vals else {}
for id, value in values.iteritems():
ng = False
if value and value.id in vals_name:
for id, value in values.iteritems():
ng = False
if value and value.id in vals_name: