diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml
index 2cc2936b436d8c3717dc154af7524bd10cba8da8..ff154c235e5f0263d704dcc41279c2de4e11c0f2 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_copyOrderProperties.xml
@@ -69,22 +69,25 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>packing_list = context\n
- \n
+\n
+tag = packing_list.getPath() + \'_confirm\'\n
+\n
 # First, copy Order properties\n
 related_order = packing_list.getCausalityValue()\n
 packing_list.edit(\n
-  comment = related_order.getComment(),\n
-  delivery_mode = related_order.getDeliveryMode(),\n
-  incoterm = related_order.getIncoterm(),\n
-  destination_administration_value = related_order.\\\n
-                           getDestinationAdministrationValue(),\n
-  title = related_order.getTitle()\n
+  comment=related_order.getComment(),\n
+  delivery_mode=related_order.getDeliveryMode(),\n
+  incoterm=related_order.getIncoterm(),\n
+  destination_administration_value=\\\n
+      related_order.getDestinationAdministrationValue(),\n
+  title=related_order.getTitle(),\n
+  activate_kw={\'tag\':tag},\n
 )\n
 \n
-activity = packing_list.activate(\n
-                   after_method_id=[\'immediateReindexObject\',\n
-                                    \'recursiveImmediateReindexObject\'])\n
-activity.ProductionDelivery_confirm()\n
+packing_list.startBuilding()\n
+packing_list.activate(after_tag=tag).updateCausalityState()\n
+\n
+packing_list.activate(after_tag=tag).ProductionDelivery_confirm()\n
 </string> </value>
         </item>
         <item>
@@ -130,8 +133,8 @@ activity.ProductionDelivery_confirm()\n
                             <string>context</string>
                             <string>packing_list</string>
                             <string>_getattr_</string>
+                            <string>tag</string>
                             <string>related_order</string>
-                            <string>activity</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
index 934329792f3c05a517fd8edf78e9ce761b05967f..6d15afb3e4cd6fd1bdc727f4c5e57a20a2806355 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -70,6 +70,9 @@
             <key> <string>_body</string> </key>
             <value> <string>packing_list = state_change[\'object\']\n
 \n
+packing_list.startBuilding()\n
+packing_list.activate().updateCausalityState()\n
+\n
 packing_list.updateAppliedRule("default_production_packing_list_rule")\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index 72f523f36edb05f0f59e02607fd52a844817ed85..86ee83a4a26867a79e0a5a8948153cff8f4cf9a4 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-39
\ No newline at end of file
+40
\ No newline at end of file