[Erp5-report] r16865 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: WorkflowTemplateIt...

[nobody at svn.erp5.org]

Author: alex
Date: Fri Oct  5 15:20:18 2007
New Revision: 16865

URL: http://svn.erp5.org?rev=16865&view=rev
Log:
Because Payment Transaction does not have a causality workflow, we cannot assume that getCausalityState will always be present.
This getattr test needs to be removed once Payment Transaction is linked to a correct causality workflow.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/scripts/SimulationMovement_calculateCausalityState.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/scripts/SimulationMovement_calculateCausalityState.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/scripts/SimulationMovement_calculateCausalityState.xml?rev=16865&r1=16864&r2=16865&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/scripts/SimulationMovement_calculateCausalityState.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/scripts/SimulationMovement_calculateCausalityState.xml Fri Oct  5 15:20:18 2007
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,7 +74,11 @@
 \n
 if delivery_movement is not None:\n
   delivery = delivery_movement.getExplanationValue()\n
-  if delivery.getCausalityState() != \'draft\':\n
+  # Because Payment Transaction does not have a causality workflow, we cannot assume that\n
+  # getCausalityState will always be present. This getattr test needs to be removed once\n
+  # Payment Transaction is linked to a correct causality workflow.\n
+  if getattr(delivery, \'getCausalityState\', None) is not None \\\n
+      and delivery.getCausalityState() != \'draft\':\n
     delivery.activate(\n
         after_path_and_method_id=(delivery_movement.getPath(),\n
         (\'recursiveImmediateReindexObject\', \'immediateReindexObject\'))).calculate()\n
@@ -142,6 +149,7 @@
                             <string>delivery_movement</string>
                             <string>None</string>
                             <string>delivery</string>
+                            <string>getattr</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=16865&r1=16864&r2=16865&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Oct  5 15:20:18 2007
@@ -1,1 +1,1 @@
-505
+507