diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index 409f9928c6f..e8ad035131b 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -1,7 +1,8 @@
-import test_base, test_expression, test_ir_values
+import test_base, test_expression, test_search, test_ir_values
 
 checks = [
     test_base,
     test_expression,
+    test_search,
     test_ir_values,
 ]
diff --git a/openerp/addons/base/tests/test_search.py b/openerp/addons/base/tests/test_search.py
new file mode 100644
index 00000000000..dc554408667
--- /dev/null
+++ b/openerp/addons/base/tests/test_search.py
@@ -0,0 +1,60 @@
+import unittest2
+
+import openerp.tests.common as common
+
+class test_expression(common.TransactionCase):
+
+    def test_search_order(self):
+
+        registry, cr, uid = self.registry, self.cr, self.uid
+
+	# Create 6 partners with a given name, and a given creation order to
+	# ensure the order of their ID. Some are set as unactive to verify they
+	# are by default excluded from the searches and to provide a second
+	# `order` argument.
+
+        partners = registry('res.partner')
+        c = partners.create(cr, uid, {'name': 'test_search_order_C'})
+        d = partners.create(cr, uid, {'name': 'test_search_order_D', 'active': False})
+        a = partners.create(cr, uid, {'name': 'test_search_order_A'})
+        b = partners.create(cr, uid, {'name': 'test_search_order_B'})
+        ab = partners.create(cr, uid, {'name': 'test_search_order_AB'})
+        e = partners.create(cr, uid, {'name': 'test_search_order_E', 'active': False})
+
+        # The tests.
+
+	# The basic searches should exclude records that have active = False.
+	# The order of the returned ids should be given by the `order`
+	# parameter of search().
+
+        name_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name asc")
+        self.assertEqual([a, ab, b, c], name_asc, "Search with 'NAME ASC' order failed.")
+        name_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name desc")
+        self.assertEqual([c, b, ab, a], name_desc, "Search with 'NAME DESC' order failed.")
+        id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id asc")
+        self.assertEqual([c, a, b, ab], id_asc, "Search with 'ID ASC' order failed.")
+        id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id desc")
+        self.assertEqual([ab, b, a, c], id_desc, "Search with 'ID DESC' order failed.")
+
+	# The inactive records shouldn't be excluded as soon as a condition on
+	# that field is present in the domain. The `order` parameter of
+	# search() should support any legal coma-separated values.
+
+        active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active asc, id asc")
+        self.assertEqual([d, e, c, a, b, ab], active_asc_id_asc, "Search with 'ACTIVE ASC, ID ASC' order failed.")
+        active_desc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active desc, id asc")
+        self.assertEqual([c, a, b, ab, d, e], active_desc_id_asc, "Search with 'ACTIVE DESC, ID ASC' order failed.")
+        active_asc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active asc, id desc")
+        self.assertEqual([e, d, ab, b, a, c], active_asc_id_desc, "Search with 'ACTIVE ASC, ID DESC' order failed.")
+        active_desc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="active desc, id desc")
+        self.assertEqual([ab, b, a, c, e, d], active_desc_id_desc, "Search with 'ACTIVE DESC, ID DESC' order failed.")
+        id_asc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id asc, active asc")
+        self.assertEqual([c, d, a, b, ab, e], id_asc_active_asc, "Search with 'ID ASC, ACTIVE ASC' order failed.")
+        id_asc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id asc, active desc")
+        self.assertEqual([c, d, a, b, ab, e], id_asc_active_desc, "Search with 'ID ASC, ACTIVE DESC' order failed.")
+        id_desc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id desc, active asc")
+        self.assertEqual([e, ab, b, a, d, c], id_desc_active_asc, "Search with 'ID DESC, ACTIVE ASC' order failed.")
+        id_desc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), '|', ('active', '=', True), ('active', '=', False)], order="id desc, active desc")
+        self.assertEqual([e, ab, b, a, d, c], id_desc_active_desc, "Search with 'ID DESC, ACTIVE DESC' order failed.")
+
+
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c1f04dbbfa8..6a1f917caa1 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4722,7 +4722,7 @@ class BaseModel(object):
                 order_direction = order_split[1].strip() if len(order_split) == 2 else ''
                 inner_clause = None
                 if order_field == 'id':
-                    order_by_clause = '"%s"."%s"' % (self._table, order_field)
+                    order_by_elements.append('"%s"."id" %s' % (self._table, order_direction))
                 elif order_field in self._columns:
                     order_column = self._columns[order_field]
                     if order_column._classic_read: