Merge lp:~therp-nl/openobject-server/7.0-lp1124130 into lp:openobject-server/7.0

Proposed by Holger Brunn (Therp)
Status: Needs review
Proposed branch: lp:~therp-nl/openobject-server/7.0-lp1124130
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/osv/fields.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/openobject-server/7.0-lp1124130
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+148187@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

4836. By Holger Brunn (Therp)

[FIX] filter out bool values when generating id list

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/fields.py'
2--- openerp/osv/fields.py 2013-01-11 17:57:17 +0000
3+++ openerp/osv/fields.py 2013-02-13 13:50:46 +0000
4@@ -462,7 +462,7 @@
5 # we use uid=1 because the visibility of a many2one field value (just id and name)
6 # must be the access right of the parent form and not the linked object itself.
7 records = dict(obj.name_get(cr, SUPERUSER_ID,
8- list(set([x for x in res.values() if isinstance(x, (int,long))])),
9+ list(set([x for x in res.values() if isinstance(x, (int,long)) and not isinstance(x, bool)])),
10 context=context))
11 for id in res:
12 if res[id] in records: