Fix _rebuild_tree to take in account inactive records

issue3509
review2401002

trytond/model/modelsql.py

@@ -1081,12 +1081,12 @@ class ModelSQL(ModelStorage):
         table = cls.__table__()
         right = left + 1
 
-        childs = cls.search([
-                (parent, '=', parent_id),
-                ], order=[])
+        cursor.execute(*table.select(table.id,
+                where=Column(table, parent) == parent_id))
+        childs = cursor.fetchall()
 
-        for child in childs:
-            right = cls._rebuild_tree(parent, child.id, right)
+        for child_id, in childs:
+            right = cls._rebuild_tree(parent, child_id, right)
 
         field = cls._fields[parent]
 

trytond/tests/test_mptt.py

@@ -19,9 +19,10 @@ class MPTTTestCase(unittest.TestCase):
         self.mptt = POOL.get('test.mptt')
 
     def CheckTree(self, parent_id=None, left=-1, right=sys.maxint):
-        childs = self.mptt.search([
-                ('parent', '=', parent_id),
-                ], order=[('left', 'ASC')])
+        with Transaction().set_context(active_test=False):
+            childs = self.mptt.search([
+                    ('parent', '=', parent_id),
+                    ], order=[('left', 'ASC')])
         for child in childs:
             assert child.left > left, \
                 '%s: left %d <= parent left %d' % \
@@ -109,6 +110,16 @@ class MPTTTestCase(unittest.TestCase):
 
             transaction.cursor.rollback()
 
+        with Transaction().start(DB_NAME, USER,
+                context=CONTEXT) as transaction:
+            records = self.mptt.search([])
+            self.mptt.write(records[::2], {
+                    'active': False
+                    })
+            self.CheckTree()
+
+            transaction.cursor.rollback()
+
         with Transaction().start(DB_NAME, USER,
                 context=CONTEXT) as transaction:
             records = self.mptt.search([])