diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
index 879a78b540f5742c1dc5bb51265c562252bdf194..7d8c51003b7e09d577b9ce4a374f51510b4e2ead 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="Interaction" module="Products.ERP5.Interaction"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5.Interaction</string>
+          <string>Interaction</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation.xml
similarity index 91%
rename from bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml
rename to bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation.xml
index 23b7e4dc5083961f952dec69a5e3a1632b1ad2f1..ea8aed8deac0a7f430eb1ceaa31f669cade44ce1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5.Interaction</string>
+          <string>InteractionDefinition</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -53,7 +56,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>DeliveryCell_edit_UpdateSimulation   </string> </value>
+            <value> <string>DeliveryCell_edit_UpdateSimulation</string> </value>
         </item>
         <item>
             <key> <string>method_id</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
index b8dc5175cb9fbe47add81eb935c38ebf0145e744..20807cc386e88b9ad31824d15f5cb3d8cd473532 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5.Interaction</string>
+          <string>InteractionDefinition</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation.xml
similarity index 94%
rename from bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml
rename to bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation.xml
index f75935cb1e337ffba3793960bedbd8a554a04976..f27c19484ab7fa2d97a80013c25c4eb00401a45f 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5.Interaction</string>
+          <string>InteractionDefinition</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -55,7 +58,7 @@ FIXME: reindexObjectSecurity is probably not optimal, it may launch  unnecessary
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Delivery_changeSimulationState_ReindexSimulation   </string> </value>
+            <value> <string>Delivery_changeSimulationState_ReindexSimulation</string> </value>
         </item>
         <item>
             <key> <string>method_id</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
index d4cb9ccff2a85cc730f16d3ff24cff005ccb7ddd..87f1ab98b3ff598f7881a89279f0d8345175e844 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5.Interaction</string>
+          <string>InteractionDefinition</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
index 66683dde0451b4de3eeb20f0fe5c7af60083c8a8..01ba35bf25f5084dde4a3822b204530dc92c3f47 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
+        <tuple>
+          <string>Products.DCWorkflow.Scripts</string>
+          <string>Scripts</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
index 5c0d6745e16d2bf3df99c3fb83137ec08257c3cc..98b0f4c7cbc8c2de70cd362e61e8083b13d23dea 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
@@ -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>
@@ -66,7 +69,8 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string># trigger the simulation update from the parent line\n
-sci[\'object\'].getParentValue().edit()\n
+line = sci[\'object\'].getParentValue()\n
+context.DeliveryLine_UpdateSimulation(sci, line)\n
 </string> </value>
         </item>
         <item>
@@ -112,6 +116,8 @@ sci[\'object\'].getParentValue().edit()\n
                             <string>sci</string>
                             <string>_getattr_</string>
                             <string>_getitem_</string>
+                            <string>line</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
index 85b20b0f37c23a918772d967a6eadd77f0077316..93b25a069c9a325525dd4346a4fbd569a0894712 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
@@ -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>
@@ -65,8 +68,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string># trigger the simulation update from the parent invoice\n
-sci[\'object\'].getParentValue().edit()\n
+            <value> <string># trigger the simulation update from the parent delivery\n
+\n
+if obj is None:\n
+  delivery = sci[\'object\'].getParentValue()\n
+else:\n
+  delivery = obj\n
+context.Delivery_UpdateSimulation(sci, delivery)\n
 </string> </value>
         </item>
         <item>
@@ -83,7 +91,7 @@ sci[\'object\'].getParentValue().edit()\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>sci</string> </value>
+            <value> <string>sci, obj=None</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -103,15 +111,19 @@ sci[\'object\'].getParentValue().edit()\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
                             <string>sci</string>
+                            <string>obj</string>
+                            <string>None</string>
                             <string>_getattr_</string>
                             <string>_getitem_</string>
+                            <string>delivery</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
@@ -123,7 +135,9 @@ sci[\'object\'].getParentValue().edit()\n
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <none/>
+              </tuple>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
index 230c786762aedff7c881cf22113e9c0591ed76d1..74e460d3359971f1dab6bd6e537bd7b3dffe6da6 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
@@ -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>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
index 38e4594ee4ebcaff0704ac73a7056c274d249be0..55489204620f74636486c2165ddbf9cd9a341339 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
@@ -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>
@@ -72,7 +75,11 @@ It is responsible of updating the applied rule\n
 \n
 """\n
 \n
-delivery = sci[\'object\']\n
+if obj is None:\n
+  delivery = sci[\'object\']\n
+else:\n
+  delivery = obj\n
+\n
 delivery_portal_type = delivery.getPortalType()\n
 portal = sci.getPortal()\n
 LOG = lambda msg:delivery.log("delivery_edit_workflow.Delivery_UpdateSimulation (%s)\\n" % (delivery.getPath()), msg)\n
@@ -122,7 +129,7 @@ LOG(\'END\')\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>sci</string> </value>
+            <value> <string>sci, obj=None</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -142,13 +149,15 @@ LOG(\'END\')\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
                             <string>sci</string>
+                            <string>obj</string>
+                            <string>None</string>
                             <string>_getitem_</string>
                             <string>delivery</string>
                             <string>_getattr_</string>
@@ -171,7 +180,9 @@ LOG(\'END\')\n
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <none/>
+              </tuple>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
index 733d9ce458eebdbf2f511e03ef3d0831d9587ce9..db67387d4e62a7db68bbb9689238ba0824326e50 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>Variables</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
index 3953ad0209bd0cd9a4f7c91ba6db81eebb08acfc..f4c2789633e196d41819670f25c55bac972e751a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
+        <tuple>
+          <string>Products.DCWorkflow.Worklists</string>
+          <string>Worklists</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 97a55e1d749c6ac7c783778b6ea2d19cb770909d..ffda4e73f09ccf34ad373cedb584812e9a8a4b72 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-101
\ No newline at end of file
+105
\ No newline at end of file