[Erp5-report] r20689 - /erp5/trunk/products/ERP5/Document/Delivery.py

[nobody at svn.erp5.org]

Author: jerome
Date: Sat Apr 19 16:07:33 2008
New Revision: 20689

URL: http://svn.erp5.org?rev=20689&view=rev
Log:
simplify applyToDeliveryRelatedMovement by using getMovementList

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

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=20689&r1=20688&r2=20689&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py Sat Apr 19 16:07:33 2008
@@ -246,25 +246,18 @@
       return container_list
 
     def applyToDeliveryRelatedMovement(self, portal_type='Simulation Movement',
-        method_id = 'expand',**kw):
+                                       method_id='expand', **kw):
       for my_simulation_movement in self.getDeliveryRelatedValueList(
                                       portal_type = 'Simulation Movement'):
-          # And apply
-          getattr(my_simulation_movement.getObject(), method_id)(**kw)
-      for m in self.contentValues(filter={'portal_type':
-                                      self.getPortalMovementTypeList()}):
+        # And apply
+        getattr(my_simulation_movement.getObject(), method_id)(**kw)
+
+      for m in self.getMovementList():
         # Find related in simulation
         for my_simulation_movement in m.getDeliveryRelatedValueList(
                                   portal_type = 'Simulation Movement'):
           # And apply
           getattr(my_simulation_movement.getObject(), method_id)(**kw)
-        for c in m.contentValues(filter={'portal_type':
-                                        self.getPortalMovementTypeList()}):
-          for my_simulation_movement in c.getDeliveryRelatedValueList(
-                                  portal_type = 'Simulation Movement'):
-            # And apply
-            getattr(my_simulation_movement.getObject(), method_id)(**kw)
-
 
     #######################################################
     # Causality computation