[Erp5-report] r34530 kazuhiko - in /erp5/trunk/bt5/erp5_simulation: DocumentTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Apr 13 21:36:07 2010
New Revision: 34530

URL: http://svn.erp5.org?rev=34530&view=rev
Log:
path rule document to _getPropertyAndCategoryList() to avoid needless calculations.

Modified:
    erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py
    erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
    erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py
    erp5/trunk/bt5/erp5_simulation/bt/revision

Modified: erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py?rev=34530&r1=34529&r2=34530&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py [utf8] Tue Apr 13 21:36:07 2010
@@ -101,9 +101,11 @@
     Input movement list comes from the parent
     """
     ret = []
+    rule = context.getSpecialiseValue()
     for input_movement, business_path in self \
             ._getInputMovementAndPathTupleList(context):
-      kw = self._getPropertyAndCategoryList(input_movement, business_path)
+      kw = self._getPropertyAndCategoryList(input_movement, business_path,
+                                            rule)
       kw.update({'order':None,'delivery':None})
       simulation_movement = context.newContent(
         portal_type=RuleMixin.movement_type,

Modified: erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py?rev=34530&r1=34529&r2=34530&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py [utf8] Tue Apr 13 21:36:07 2010
@@ -101,9 +101,11 @@
     i.e. business paths are not taken into account.
     """
     ret = []
+    rule = context.getSpecialiseValue()
     for input_movement, business_path in self \
             ._getInputMovementAndPathTupleList(context):
-      kw = self._getPropertyAndCategoryList(input_movement, business_path)
+      kw = self._getPropertyAndCategoryList(input_movement, business_path,
+                                            rule)
       kw.update({'order':None,'delivery':None})
       simulation_movement = context.newContent(
         portal_type=RuleMixin.movement_type,

Modified: erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py?rev=34530&r1=34529&r2=34530&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py [utf8] Tue Apr 13 21:36:07 2010
@@ -105,6 +105,7 @@
       return movement_list
 
     context_movement = context.getParentValue()
+    rule = context.getSpecialiseValue()
     for amount in trade_condition.getAggregatedAmountList(context_movement):
       # business path specific
       business_path_list = business_process.getPathValueList(
@@ -117,7 +118,8 @@
 
       business_path = business_path_list[0]
 
-      kw = self._getPropertyAndCategoryList(context_movement, business_path)
+      kw = self._getPropertyAndCategoryList(context_movement, business_path,
+                                            rule)
 
       # rule specific
       kw['price'] = amount.getPrice() or amount.getEfficiency()

Modified: erp5/trunk/bt5/erp5_simulation/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/bt/revision?rev=34530&r1=34529&r2=34530&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] Tue Apr 13 21:36:07 2010
@@ -1,1 +1,1 @@
-80
+81