_migrateSimulationTree: automatically delete orphan Simulation Movements

product/ERP5/Document/AppliedRule.py

@@ -322,6 +322,7 @@ class AppliedRule(XMLObject, ExplainableMixin):
       if history_item['simulation_state'] in draft_state_list:
         continue
       # Delivery is/was not is draft state
+      resolveCategory = portal.portal_categories.resolveCategory
       order_dict = {}
       old_dict = {}
       # Caller may want to drop duplicate SM, like a unbuilt SM if there's
@@ -330,7 +331,10 @@ class AppliedRule(XMLObject, ExplainableMixin):
       # remember them and returns None for duplicates.
       sort_sm = lambda x: (not x.getDelivery(), not x.getQuantity(), x.getId())
       for sm in sorted(self.objectValues(), key=sort_sm):
-        sm_dict = old_dict.setdefault(sm.getOrder() or sm.getDelivery(), {})
+        line = sm.getOrder() or sm.getDelivery()
+        # Check SM is not orphan, which happened with old buggy trees.
+        if resolveCategory(line) is not None:
+          sm_dict = old_dict.setdefault(line, {})
           recurse_list = deque(({get_matching_key(sm): (sm,)},))
           while recurse_list:
             for k, x in recurse_list.popleft().iteritems():
@@ -349,7 +353,8 @@ class AppliedRule(XMLObject, ExplainableMixin):
                     r.setdefault(x.getSpecialise(), []).append(sm_list)
                 for x in r.values():
                   if len(x) > 1:
-                  x = [y for y in x if any(z.getDelivery() for z in y)] or x[:1]
+                    x = [y for y in x if any(z.getDelivery()
+                           for z in y)] or x[:1]
                   x, = x
                   r = {}
                   for x in x: