[MERGE] forward port of branch 7.0 up to 3e7d3c7

2015-04-27 12:19:43 +02:00
parent 9323f2b4c7 3e7d3c7ee4
commit d6ae7fb7db
16 changed files with 73 additions and 26 deletions
@@ -109,8 +109,11 @@ class document_file(osv.osv):
            ids.extend(parents[parent_id])

        # sort result according to the original sort ordering
-        ids = [id for id in orig_ids if id in ids]
-        return len(ids) if count else ids
+        if count:
+            return len(ids)
+        else:
+            set_ids = set(ids)
+            return [id for id in orig_ids if id in set_ids]

    def copy(self, cr, uid, id, default=None, context=None):
        if not default: