path rule document to _getPropertyAndCategoryList() to avoid needless calculations.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34530 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py

@@ -101,9 +101,11 @@ class DeliveryRuleMovementGenerator(MovementGeneratorMixin):
     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,

bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py

@@ -101,9 +101,11 @@ class InvoicingRuleMovementGenerator(MovementGeneratorMixin):
     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,

bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py

@@ -105,6 +105,7 @@ class TradeModelRuleMovementGenerator(MovementGeneratorMixin):
       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 @@ class TradeModelRuleMovementGenerator(MovementGeneratorMixin):
 
       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()

bt5/erp5_simulation/bt/revision

-80
+81
\ No newline at end of file