diff --git a/product/ERP5/Document/Movement.py b/product/ERP5/Document/Movement.py
index b8dc47b87bb030c14a660f73f89ae0941d2804c9..85577bc7c959da53df876bd9a2dd7a0f793a42a2 100755
--- a/product/ERP5/Document/Movement.py
+++ b/product/ERP5/Document/Movement.py
@@ -339,24 +339,11 @@ class Movement(XMLObject, Amount):
 
       emit targetUnreachable !
     """
+    for simulation_movement in self.getDeliveryRelatedValueList():
+      if simulation_movement.isDivergent():
+        return 1
     return 0
 
-# XXX moved to portal simulation
-#   # Solver
-#   def solve(self, dsolver, tsolver):
-#     if dsolver is not None:
-#       self.applyDeliverySolver(dsolver)
-#     if tsolver is not None:
-#       self.applyTargetSolver(tsolver)
-#
-#   security.declareProtected(Permissions.ModifyPortalContent, 'applyDeliverySolver')
-#   def applyDeliverySolver(self, solver):
-#     self.portal_simulation.applyDeliverySolver(self, solver)
-#
-#   security.declareProtected(Permissions.ModifyPortalContent, 'applyTargetSolver')
-#   def applyTargetSolver(self, solver):
-#     self.portal_simulation.applyTargetSolver(self, solver)
-
   security.declareProtected(Permissions.AccessContentsInformation, 'getExplanation')
   def getExplanation(self):
     """