Merge lp:~hbrunn/ocb-server/7.0-lp1124130 into lp:ocb-server

[Holger Brunn (Therp)]

automatically derived from https://code.launchpad.net/~therp-nl/openobject-server/7.0-lp1124130 for https://code.launchpad.net/~openerp/openobject-server/7.0

[Stefan Rijnhart (Opener) (stefan-opener)]

Read the line in a larger context in fields.py and it looks good. I'd say something about the line length but it was already too long before you inserted this bit. You could still consider changing it as you wrote the original patch for the official branches. These have not yet been merged so you could change it there too.

Note that I am against unnecessary refactoring in this project to avoid conflicts with upstream, but in this case it would not make a difference. Not blocking AFAIK.

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Oh, like I mentioned in another MP, please link this project+series to the bug report.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

I merged this one. I hope I did it correctly... Please scold me if I goofed. :-)

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

No, that's fine. Thanks!

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2013-01-11 17:57:17 +0000
+++ openerp/osv/fields.py	2013-02-13 14:34:24 +0000
@@ -462,7 +462,7 @@
         # we use uid=1 because the visibility of a many2one field value (just id and name)
         # must be the access right of the parent form and not the linked object itself.
         records = dict(obj.name_get(cr, SUPERUSER_ID,
-                                    list(set([x for x in res.values() if isinstance(x, (int,long))])),
+                                    list(set([x for x in res.values() if isinstance(x, (int,long)) and not isinstance(x, bool)])),
                                     context=context))
         for id in res:
             if res[id] in records: