Merge lp:~openerp-dev/openobject-addons/trunk-bug-1158856-Pooja into lp:openobject-addons

[Pooja Zankhariya(OpenERP)]

Hello,
      I have fixed sorting by documents in list view.

Thanks,
Pooja.

Unmerged revisions

8659. By Pooja Zankhariya(OpenERP) on 2013-04-03

[FIX] sort in document management.

=== modified file 'document/document.py'
--- document/document.py	2013-03-27 14:01:49 +0000
+++ document/document.py	2013-04-03 10:34:27 +0000
@@ -80,6 +80,7 @@
         if not ids:
             return 0 if count else []
 
+        orig_ids = ids
         # Filter out documents that are in directories that the user is not allowed to read.
         # Must use pure SQL to avoid access rules exceptions (we want to remove the records,
         # not fail), and the records have been filtered in parent's search() anyway.
@@ -99,6 +100,8 @@
         for parent_id in visible_parent_ids:
             ids.extend(parents[parent_id])
 
+        # sort result according to the original sort ordering
+        ids.sort(key=(orig_ids+ids).index)
         return len(ids) if count else ids
 
     def copy(self, cr, uid, id, default=None, context=None):