Added validation of orphane movements for isDivergent

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@130 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/DeliveryCell.py

@@ -136,6 +136,13 @@ Une ligne tarifaire."""
       if kw.has_key('item_id_list'):
         self._setItemIdList( kw['item_id_list'] )
 
+    security.declareProtected(Permissions.View, 'isDivergent')
+    def isDivergent(self):
+      """
+        For DeliveryCell, consider orphane
+      """
+      return Movement.isDivergent(self) or (not self.hasSimulationMovement())
+
     security.declareProtected( Permissions.ModifyPortalContent, 'hasCellContent' )
     def hasCellContent(self, base_id='movement'):
       """

product/ERP5/Document/DeliveryLine.py

@@ -309,8 +309,10 @@ Une ligne tarifaire."""
         for cell in self.contentValues(filter={'portal_type': 'Delivery Cell'}):
           if cell.isDivergent():
             return 1
+          if not cell.hasSimulationMovement():
+            return 1
       else:
-         return Movement.isDivergent(self)
+         return Movement.isDivergent(self) or (not self.hasSimulationMovement())
 
     security.declareProtected(Permissions.ModifyPortalContent, 'applyTargetSolver')
     def applyTargetSolver(self, solver):

product/ERP5/Document/Movement.py

@@ -419,3 +419,9 @@ a service in a public administration)."""
   def getExplanationValue(self):
     # This method allows to group Delivery movements and Simulation movements in a different way
     return self.getDeliveryValue()
+
+  # Simulation
+  security.declareProtected(Permissions.View, 'hasSimulationMovement')
+  self hasSimulationMovement(self):
+    return len(self.getDeliveryRelatedValueList()) > 0 or len(self.getOrderRelatedValueList()) > 0
+