[Erp5-report] r34189 kazuhiko - /erp5/trunk/products/ERP5/mixin/movement_collection_updater.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Mar 29 16:51:52 2010
New Revision: 34189

URL: http://svn.erp5.org?rev=34189&view=rev
Log:
aggregation is not required here, because we want to have one simulation movement per one order line just same as before.

Modified:
    erp5/trunk/products/ERP5/mixin/movement_collection_updater.py

Modified: erp5/trunk/products/ERP5/mixin/movement_collection_updater.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/movement_collection_updater.py?rev=34189&r1=34188&r2=34189&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/movement_collection_updater.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/movement_collection_updater.py [utf8] Mon Mar 29 16:51:52 2010
@@ -95,23 +95,7 @@
         else:
           tester_key.append(None)
       tester_key = tuple(tester_key)
-      # try to aggregate
-      aggregated_movement_list = prevision_movement_dict.setdefault(tester_key,
-                                                                    [])
-      no_match = True
-      for aggregated_movement in aggregated_movement_list:
-        if _compare(tester_list, aggregated_movement, movement):
-          no_match = False
-          order = movement.getOrder()
-          if order is not None:
-            aggregated_movement.setOrderList(
-              aggregated_movement.getOrderList() + [order])
-          aggregated_movement.setConvertedQuantity(
-            aggregated_movement.getConvertedQuantity() + \
-            movement.getConvertedQuantity())
-      if no_match:
-        aggregated_movement_list.append(movement)
-      prevision_movement_dict[tester_key] = aggregated_movement_list
+      prevision_movement_dict.setdefault(tester_key, []).append(movement)
 
     # Prepare a mapping between prevision and decision
     # The prevision_to_decision_map is a list of tuples