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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Apr 22 13:55:27 2010
New Revision: 34724

URL: http://svn.erp5.org?rev=34724&view=rev
Log:
same as r34722 (in Invoice Simulation Rule, source should be source_administration of the input movement or its order's source. Same for destination).

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

Modified: erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py?rev=34724&r1=34723&r2=34724&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py [utf8] Thu Apr 22 13:55:27 2010
@@ -95,10 +95,8 @@
   def getGeneratedMovementList(self, context, movement_list=None,
                                 rounding=False):
     """
-    Input movement list comes from order
-
-    XXX This implementation is very primitive, and does not support BPM,
-    i.e. business paths are not taken into account.
+    In Invoice Simulation Rule, source should be source_administration
+    of the input movement or its order's source. Same for destination.
     """
     ret = []
     rule = context.getSpecialiseValue()
@@ -106,7 +104,13 @@
             ._getInputMovementAndPathTupleList(context):
       kw = self._getPropertyAndCategoryList(input_movement, business_path,
                                             rule)
-      kw.update({'order':None,'delivery':None})
+      root_simulation_movement = input_movement.getRootSimulationMovement()
+      source = input_movement.getSourceAdministration() or \
+               root_simulation_movement.getSource()
+      destination = input_movement.getDestinationAdministration() or \
+                    root_simulation_movement.getDestination()
+      kw.update({'order':None, 'delivery':None,
+                 'source':source, 'destination':destination})
       simulation_movement = context.newContent(
         portal_type=RuleMixin.movement_type,
         temp_object=True,

Modified: erp5/trunk/bt5/erp5_simulation/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/bt/revision?rev=34724&r1=34723&r2=34724&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] Thu Apr 22 13:55:27 2010
@@ -1,1 +1,1 @@
-81
+82