[Erp5-report] r33793 kazuhiko - /erp5/trunk/products/ERP5/Document/Order.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar 17 12:50:00 2010
New Revision: 33793

URL: http://svn.erp5.org?rev=33793&view=rev
Log:
* rename applyToOrderRelatedMovement to applyToDeliveryRelatedMovement and keep the original name as the alias.
* try to find delivery related first for better performance in the new simulation hierarchy.

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

Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=33793&r1=33792&r2=33793&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Order.py [utf8] Wed Mar 17 12:50:00 2010
@@ -117,35 +117,38 @@
       kw.setdefault('portal_type', self.getPortalOrderMovementTypeList())
       return Delivery.getTotalQuantity(self, **kw)
     
-    def applyToOrderRelatedMovement(self, portal_type='Simulation Movement', \
-                                    method_id = 'expand',**kw):
+    def applyToDeliveryRelatedMovement(self, portal_type='Simulation Movement',
+                                       method_id='expand',**kw):
       """
         Warning: does not work if it was not catalogued immediately
       """
       # 'order' category is deprecated. it is kept for compatibility.
-      for my_simulation_movement in self.getOrderRelatedValueList(
+      for my_simulation_movement in self.getDeliveryRelatedValueList(
           portal_type='Simulation Movement') or \
-          self.getDeliveryRelatedValueList(
+          self.getOrderRelatedValueList(
           portal_type='Simulation Movement'):
           # And apply
           getattr(my_simulation_movement, method_id)(**kw)
       for m in self.contentValues(filter={'portal_type': \
                                           self.getPortalMovementTypeList()}):
         # Find related in simulation
-        for my_simulation_movement in m.getOrderRelatedValueList(
+        for my_simulation_movement in m.getDeliveryRelatedValueList(
             portal_type='Simulation Movement') or \
-            m.getDeliveryRelatedValueList(
+            m.getOrderRelatedValueList(
             portal_type='Simulation Movement'):
           # And apply
           getattr(my_simulation_movement, method_id)(**kw)
         for c in m.contentValues(filter={'portal_type':
             self.getPortalMovementTypeList()}):
-          for my_simulation_movement in c.getOrderRelatedValueList(
+          for my_simulation_movement in c.getDeliveryRelatedValueList(
               portal_type='Simulation Movement') or \
-              c.getDeliveryRelatedValueList(
+              c.getOrderRelatedValueList(
               portal_type='Simulation Movement'):
             # And apply
             getattr(my_simulation_movement, method_id)(**kw)
+
+    # 'order' category is deprecated. it is kept for compatibility.
+    applyToOrderRelatedMovement = applyToDeliveryRelatedMovement
 
     def applyToOrderRelatedAppliedRule(self, method_id='expand',**kw):
       my_applied_rule = self.getCausalityRelatedValue( \