diff --git a/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 06bb2a2fa11bb18b1be37f91dbcd16167441181f..fe33e0d75e8958a2a4818f7fd7033d9717fe9b12 100644
--- a/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,15 +1,15 @@
 <workflow_chain>
  <chain>
   <type>Production Order</type>
-  <workflow>delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow, production_order_workflow</workflow>
+  <workflow>delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow, order_simulation_interaction_workflow, production_order_workflow</workflow>
  </chain>
  <chain>
   <type>Production Order Cell</type>
-  <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
+  <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, order_movement_simulation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Production Order Line</type>
-  <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, production_matrix_workflow, transformation_interaction_workflow</workflow>
+  <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, order_movement_simulation_interaction_workflow, production_matrix_workflow, production_order_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Production Order Model Root Simulation Rule</type>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow.xml
similarity index 89%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow.xml
index 3676e8b89e0709423eaea7653483846fabfcc1a7..e9a1e081c6465e6ec8192b2b9a0114213eee2191 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow.xml
@@ -23,7 +23,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>transformation_interaction_workflow</string> </value>
+            <value> <string>production_order_interaction_workflow</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/interactions.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions.xml
similarity index 100%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/interactions.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions.xml
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/interactions/ProductionOrderLine_setResource.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/ProductionOrderLine_setResource.xml
similarity index 94%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/interactions/ProductionOrderLine_setResource.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/ProductionOrderLine_setResource.xml
index 65c20b4f5fe69bf58ed09c2a209a6523618421b9..015045b50dc64744dfea8533640818f618d26271 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/interactions/ProductionOrderLine_setResource.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/interactions/ProductionOrderLine_setResource.xml
@@ -35,6 +35,12 @@
               </list>
             </value>
         </item>
+        <item>
+            <key> <string>before_commit_script_name</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>Setting the resource will set best, if found, transformation related to this resource on movement.</string> </value>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/scripts.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts.xml
similarity index 100%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/scripts.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts.xml
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/scripts/ProductionOrderLine_setTransformationFromResource.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/ProductionOrderLine_setTransformationFromResource.xml
similarity index 100%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/scripts/ProductionOrderLine_setTransformationFromResource.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/ProductionOrderLine_setTransformationFromResource.xml
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/variables.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/variables.xml
similarity index 100%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/variables.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/variables.xml
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/worklists.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/worklists.xml
similarity index 100%
rename from bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow/worklists.xml
rename to bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/worklists.xml
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index af40ff6b882b7bd2455294febc16e3d08cd17de9..1fde7522a771ec6f5d8c6237abe49bac75f547c8 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-433
\ No newline at end of file
+434
\ No newline at end of file
diff --git a/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list b/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list
index a63dddacb9d1c1501a34cffae69fdbf0671d9b43..bbd092fa3225d026592cb0ce4bee6e3311c25706 100644
--- a/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list
@@ -5,7 +5,7 @@ Production Order Line | delivery_movement_causality_interaction_workflow
 Production Order Line | delivery_movement_simulation_interaction_workflow
 Production Order Line | edit_workflow
 Production Order Line | production_matrix_workflow
-Production Order Line | transformation_interaction_workflow
+Production Order Line | production_order_interaction_workflow
 Production Order Model Root Simulation Rule | edit_workflow
 Production Order Model Root Simulation Rule | rule_validation_workflow
 Production Order Model Rule | edit_workflow
diff --git a/bt5/erp5_mrp/bt/template_workflow_id_list b/bt5/erp5_mrp/bt/template_workflow_id_list
index 3727a2f8c9d18e3e971b05d09681080bf6a7c9b1..a5254652a563baa430add027c621b22c30472b03 100644
--- a/bt5/erp5_mrp/bt/template_workflow_id_list
+++ b/bt5/erp5_mrp/bt/template_workflow_id_list
@@ -1,4 +1,4 @@
 production_matrix_workflow
+production_order_interaction_workflow
 production_order_workflow
-production_packing_list_workflow
-transformation_interaction_workflow
\ No newline at end of file
+production_packing_list_workflow
\ No newline at end of file