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

1 files changed, 5 insertions, 2 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index 238e4562349..e8b708fd706 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -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: