[Erp5-report] r32093 kazuhiko - /erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Jan 29 16:28:33 2010
New Revision: 32093

URL: http://svn.erp5.org?rev=32093&view=rev
Log:
we need to retrieve source and destination values for bank related simulation movements.

Modified:
    erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/PaymentRule.py

Modified: erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/PaymentRule.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/PaymentRule.py?rev=32093&r1=32092&r2=32093&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/PaymentRule.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/PaymentRule.py [utf8] Fri Jan 29 16:28:33 2010
@@ -37,6 +37,7 @@
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from Products.ERP5.MovementCollectionDiff import _getPropertyAndCategoryList
 
 class PaymentRule(RuleMixin, MovementCollectionUpdaterMixin, Predicate):
   """
@@ -103,7 +104,10 @@
     ret = []
     for input_movement, business_path in self \
             ._getInputMovementAndPathTupleList(context):
-      kw = self._getPropertyAndCategoryList(input_movement, business_path)
+      # Payment Rule does not work with Business Path
+      if business_path is None:
+        continue
+      kw = _getPropertyAndCategoryList(input_movement)
       kw.update({'order':None,'delivery':None})
       quantity = kw.pop('quantity', 0)
       # one for payable
@@ -114,6 +118,8 @@
         **kw)
       ret.append(simulation_movement)
       # one for bank
+      kw.update({'source':business_path.getSource(),
+                 'destination':business_path.getDestination(),})
       simulation_movement = context.newContent(
         portal_type=RuleMixin.movement_type,
         temp_object=True,