From e3296e894b4e25cbe45035e10e33f38bad075b79 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 26 Aug 2010 00:34:31 +0530
Subject: [PATCH] [FIX] Server side sorting for _inherits relations corrected

bzr revid: jvo@tinyerp.com-20100825190431-bh3fxeu044sv8xaj
---
 bin/osv/expression.py | 6 +++---
 bin/osv/orm.py        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index f251f0bc444..3aa77f693b0 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -71,7 +71,7 @@ class expression(object):
             raise ValueError('Bad domain expression: %r' % (exp,))
         self.__exp = exp
         self.__field_tables = {}  # used to store the table to use for the sql generation. key = index of the leaf
-        self.__all_tables = set()
+        self.__all_tables = []
         self.__joins = []
         self.__main_table = None # 'root' table. set by parse()
         self.__DUMMY_LEAF = (1, '=', 1) # a dummy leaf that must not be parsed or sql generated
@@ -106,7 +106,7 @@ class expression(object):
                 return [(left, 'in', rg(ids, table, parent or table._parent_name))]
 
         self.__main_table = table
-        self.__all_tables.add(table)
+        self.__all_tables.append(table)
 
         i = -1
         while i + 1<len(self.__exp):
@@ -129,7 +129,7 @@ class expression(object):
                     working_table = main_table.pool.get(main_table._inherit_fields[fargs[0]][0])
                     if working_table not in self.__all_tables:
                         self.__joins.append('%s.%s=%s.%s' % (working_table._table, 'id', main_table._table, main_table._inherits[working_table._name]))
-                        self.__all_tables.add(working_table)
+                        self.__all_tables.append(working_table)
                     main_table = working_table
 
             field = working_table._columns.get(fargs[0], False)
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 315937d06b2..ebb65096ca1 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3827,7 +3827,7 @@ class orm(orm_template):
                     # Allowing inherits'ed field for server side sorting
                     inherited_tables, inherit_join = self._inherits_join_calc(o, tables, where_clause)
                     if inherited_tables:
-                        inherited_sort_table = inherited_tables[0]
+                        inherited_sort_table = inherited_tables[-1]
                         order_by = inherited_sort_table + '.' + order
 
         limit_str = limit and ' limit %d' % limit or ''