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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Jan 21 16:07:04 2008
New Revision: 18804

URL: http://svn.erp5.org?rev=18804&view=rev
Log:
* for safety, do not skip calculate even if simulation state is 'draft'.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow/scripts/Delivery_calculateCausalityState.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow/scripts/DeliveryMovement_calculateCausalityState.xml
    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/delivery_causality_interaction_workflow/scripts/Delivery_calculateCausalityState.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow/scripts/Delivery_calculateCausalityState.xml?rev=18804&r1=18803&r2=18804&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow/scripts/Delivery_calculateCausalityState.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow/scripts/Delivery_calculateCausalityState.xml Mon Jan 21 16:07:04 2008
@@ -68,10 +68,8 @@
             <value> <string>delivery = state_change[\'object\']\n
 \n
 getCausalityState = getattr(delivery, \'getCausalityState\', None)\n
-getSimulationState = getattr(delivery, \'getSimulationState\', None)\n
 \n
-if getCausalityState is not None and getCausalityState() != \'draft\' and \\\n
-   getSimulationState is not None and getSimulationState() != \'draft\':\n
+if getCausalityState is not None and getCausalityState() != \'draft\':\n
   delivery.calculate()\n
 </string> </value>
         </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow/scripts/DeliveryMovement_calculateCausalityState.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow/scripts/DeliveryMovement_calculateCausalityState.xml?rev=18804&r1=18803&r2=18804&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow/scripts/DeliveryMovement_calculateCausalityState.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow/scripts/DeliveryMovement_calculateCausalityState.xml Mon Jan 21 16:07:04 2008
@@ -79,10 +79,8 @@
 # in the Accounting Transaction Module\n
 \n
 getCausalityState = getattr(delivery, \'getCausalityState\', None)\n
-getSimulationState = getattr(delivery, \'getSimulationState\', None)\n
 \n
-if getCausalityState is not None and getCausalityState() != \'draft\' and \\\n
-   getSimulationState is not None and getSimulationState() != \'draft\':\n
+if getCausalityState is not None and getCausalityState() != \'draft\':\n
   delivery.calculate()\n
 </string> </value>
         </item>

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=18804&r1=18803&r2=18804&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 Mon Jan 21 16:07:04 2008
@@ -75,10 +75,8 @@
   # getCausalityState will always be present. This getattr test needs to be removed once\n
   # Payment Transaction is linked to a correct causality workflow.\n
   getCausalityState = getattr(delivery, \'getCausalityState\', None)\n
-  getSimulationState = getattr(delivery, \'getSimulationState\', None)\n
 \n
-  if getCausalityState is not None and getCausalityState() != \'draft\' and \\\n
-     getSimulationState is not None and getSimulationState() != \'draft\':\n
+  if getCausalityState is not None and getCausalityState() != \'draft\':\n
     delivery.activate(\n
         after_path_and_method_id=(delivery_movement.getPath(),\n
         (\'recursiveImmediateReindexObject\', \'immediateReindexObject\'))).calculate()\n
@@ -151,7 +149,6 @@
                             <string>delivery</string>
                             <string>getattr</string>
                             <string>getCausalityState</string>
-                            <string>getSimulationState</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=18804&r1=18803&r2=18804&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Mon Jan 21 16:07:04 2008
@@ -1,1 +1,1 @@
-676
+677