[Erp5-report] r31479 kazuhiko - in /erp5/trunk/products/ERP5: Document/ mixin/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Dec 28 11:05:28 2009
New Revision: 31479

URL: http://svn.erp5.org?rev=31479&view=rev
Log:
now aggregation is done in applied rule level.

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

Modified: erp5/trunk/products/ERP5/Document/NewOrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/NewOrderRule.py?rev=31479&r1=31478&r2=31479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/NewOrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/NewOrderRule.py [utf8] Mon Dec 28 11:05:28 2009
@@ -129,7 +129,7 @@
     return (movement.getSource() is None or movement.getDestination() is None)
 
 class OrderRuleMovementGenerator(object):
-  def getAggregatedMovementList(self, context, movement_list=None,
+  def getGeneratedMovementList(self, context, movement_list=None,
                                 rounding=False):
     """
     Input movement list comes from order

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=31479&r1=31478&r2=31479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/movement_collection_updater.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/movement_collection_updater.py [utf8] Mon Dec 28 11:05:28 2009
@@ -66,7 +66,7 @@
     """
     # We suppose here that we have an IMovementCollection in hand
     decision_movement_list = context.getMovementList()
-    prevision_movement_list = movement_generator.getAggregatedMovementList(
+    prevision_movement_list = movement_generator.getGeneratedMovementList(
       self._getMovementGeneratorContext(context),
       movement_list=self._getMovementGeneratorMovementList(), rounding=rounding)