[Erp5-report] r32394 kazuhiko - /erp5/trunk/products/ERP5/Document/DeliveryRule.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Feb 10 08:45:40 2010
New Revision: 32394

URL: http://svn.erp5.org?rev=32394&view=rev
Log:
fix a bug that creats a new simulation movement for already simulated movement in BPM case.

Modified:
    erp5/trunk/products/ERP5/Document/DeliveryRule.py

Modified: erp5/trunk/products/ERP5/Document/DeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryRule.py?rev=32394&r1=32393&r2=32394&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] Wed Feb 10 08:45:40 2010
@@ -270,10 +270,17 @@
   def _getInputMovementList(self, applied_rule):
     """Return list of movements from delivery"""
     delivery = applied_rule.getDefaultCausalityValue()
+    movement_list = []
     if delivery is not None:
-      return delivery.getMovementList(
-                     portal_type=delivery.getPortalDeliveryMovementTypeList())
-    return []
+      existing_movement_list = applied_rule.objectValues()
+      for movement in delivery.getMovementList(
+        portal_type=delivery.getPortalDeliveryMovementTypeList()):
+        simulation_movement = self._getDeliveryRelatedSimulationMovement(
+          movement)
+        if simulation_movement is None or \
+               simulation_movement in existing_movement_list:
+          movement_list.append(movement)
+    return movement_list
 
   def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
       business_path, current_property_dict):