From b58797ff09513b85e21f27bef73b13d03edcf0c1 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Fri, 28 Mar 2008 14:14:25 +0000
Subject: [PATCH] clear order/delivery on related simulation movements only
 when its value is the deleted movement. Thanks to Kazuhiko

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20198 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 ...ionTransactionContent_updateRelatedSimulationMovement.xml | 5 ++++-
 ...ortisationTransaction_updateRelatedSimulationMovement.xml | 5 ++++-
 bt5/erp5_immobilisation/bt/revision                          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml
index 23f97bfd93..28ea7b7e40 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml
@@ -66,8 +66,10 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>line = state_change[\'object\']\n
+# Clean simulation\n
 for simulation_movement in line.getDeliveryRelatedValueList():\n
-  simulation_movement.edit(delivery=\'\')\n
+  if simulation_movement.getDelivery() == line.getRelativeUrl():\n
+    simulation_movement.setDelivery(None)\n
 </string> </value>
         </item>
         <item>
@@ -128,6 +130,7 @@ for simulation_movement in line.getDeliveryRelatedValueList():\n
                             <string>_getiter_</string>
                             <string>_getattr_</string>
                             <string>simulation_movement</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml
index 8bcb78c53e..00e9fa2e73 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml
@@ -66,9 +66,11 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>delivery = state_change[\'object\']\n
+# Clean simulation\n
 for line in delivery.getMovementList():\n
   for simulation_movement in line.getDeliveryRelatedValueList():\n
-    simulation_movement.edit(delivery=\'\')\n
+    if simulation_movement.getDelivery() == line.getRelativeUrl():\n
+      simulation_movement.setDelivery(None)\n
 </string> </value>
         </item>
         <item>
@@ -130,6 +132,7 @@ for line in delivery.getMovementList():\n
                             <string>_getattr_</string>
                             <string>line</string>
                             <string>simulation_movement</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/bt/revision b/bt5/erp5_immobilisation/bt/revision
index aca544d017..bc768da71a 100644
--- a/bt5/erp5_immobilisation/bt/revision
+++ b/bt5/erp5_immobilisation/bt/revision
@@ -1 +1 @@
-145
\ No newline at end of file
+146
\ No newline at end of file
-- 
2.30.9