diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/set_ready.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/set_ready.xml
deleted file mode 100644
index 44adfbb21e829876b3da0978dd91985f2607c9f7..0000000000000000000000000000000000000000
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/set_ready.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>set_ready</string> </value>
-        </item>
-        <item>
-            <key> <string>new_state_id</string> </key>
-            <value> <string>ready</string> </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/set_ready_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/set_ready_action.xml
deleted file mode 100644
index be41fa163ab3fef272fade79dfa2ca58d8a7560e..0000000000000000000000000000000000000000
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/set_ready_action.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string>Set ready</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=set_ready_action</string> </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value> <string>set_ready</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>set_ready_action</string> </value>
-        </item>
-        <item>
-            <key> <string>new_state_id</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>expr</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>python:(here.getCausalityState() not in (\'building\',\'diverged\')) and (here.getPortalType() != \'Sale Packing List\' or here.getContainerState() == \'packed\')</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_appliedToRelatedMovement.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_appliedToRelatedMovement.xml
similarity index 94%
rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_appliedToRelatedMovement.xml
rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_appliedToRelatedMovement.xml
index 326c8f24a29583df040685a4cb76f4c50ed13db9..c2a6e095380336b96721397cb40c6eb2f3e078d3 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_appliedToRelatedMovement.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_appliedToRelatedMovement.xml
@@ -68,9 +68,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>order = state_change.object\n
+            <value> <string>task = state_change.object\n
 \n
-order.applyToOrderRelatedMovement(method_id=\'expand\')\n
+task.applyToOrderRelatedMovement(method_id=\'expand\')\n
 </string> </value>
         </item>
         <item>
@@ -115,7 +115,7 @@ order.applyToOrderRelatedMovement(method_id=\'expand\')\n
                           <tuple>
                             <string>state_change</string>
                             <string>_getattr_</string>
-                            <string>order</string>
+                            <string>task</string>
                           </tuple>
                         </value>
                     </item>
@@ -132,7 +132,7 @@ order.applyToOrderRelatedMovement(method_id=\'expand\')\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Order_appliedToRelatedMovement</string> </value>
+            <value> <string>Task_appliedToRelatedMovement</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
similarity index 83%
rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_buildPackingList.xml
rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
index 370a4612072db5551db8f565b22940c8ffbed55e..a4b0a77be5ec3c16ffe9a2c93f8cb8a19ca74ede 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
@@ -68,22 +68,15 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>order = state_change.object\n
+            <value> <string>task = state_change.object\n
 \n
-previous_tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
-expand_tag = order.getPath() + \'_expand\'\n
+previous_tag = task.getPath() + \'_firstUpdateAppliedRule\'\n
+expand_tag = task.getPath() + \'_expand\'\n
 activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
-order.activate(tag=expand_tag,after_tag=previous_tag).updateAppliedRule(rule_id = \'default_order_rule\',activate_kw=activate_kw)\n
+task.activate(tag=expand_tag,after_tag=previous_tag).updateAppliedRule(rule_id = \'default_order_rule\',activate_kw=activate_kw)\n
 \n
-order_portal_type = order.getPortalType()\n
-if order_portal_type == \'Sale Order\':\n
-  delivery_builder = order.portal_deliveries.sale_packing_list_builder\n
-elif order_portal_type == \'Purchase Order\':\n
-  delivery_builder = order.portal_deliveries.purchase_packing_list_builder\n
-elif order_portal_type == \'Task\':\n
-  delivery_builder = order.portal_deliveries.task_report_builder\n
-\n
-delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=order.getUid())\n
+delivery_builder = task.portal_deliveries.task_report_builder\n
+delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=task.getUid())\n
 </string> </value>
         </item>
         <item>
@@ -128,11 +121,10 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(expl
                           <tuple>
                             <string>state_change</string>
                             <string>_getattr_</string>
-                            <string>order</string>
+                            <string>task</string>
                             <string>previous_tag</string>
                             <string>expand_tag</string>
                             <string>activate_kw</string>
-                            <string>order_portal_type</string>
                             <string>delivery_builder</string>
                           </tuple>
                         </value>
@@ -150,7 +142,7 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(expl
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Order_buildPackingList</string> </value>
+            <value> <string>Task_buildTaskReport</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_createOrderRule.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_createOrderRule.xml
similarity index 93%
rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_createOrderRule.xml
rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_createOrderRule.xml
index e1491544177e65ca39c01cccf9ac1a06e4e18624..c9fa5e5d874b710fc76f7960c8de4992a15e401c 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Order_createOrderRule.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_createOrderRule.xml
@@ -68,11 +68,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>order = state_change.object\n
+            <value> <string>task = state_change.object\n
 \n
-tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
+tag = task.getPath() + \'_firstUpdateAppliedRule\'\n
 activate_kw = {\'tag\':tag,\'priority\':3}\n
-order.activate(tag=tag).updateAppliedRule(rule_id = \'default_order_rule\',activate_kw=activate_kw)\n
+task.activate(tag=tag).updateAppliedRule(rule_id = \'default_order_rule\',activate_kw=activate_kw)\n
 </string> </value>
         </item>
         <item>
@@ -118,7 +118,7 @@ order.activate(tag=tag).updateAppliedRule(rule_id = \'default_order_rule\',activ
                             <string>state_change</string>
                             <string>kw</string>
                             <string>_getattr_</string>
-                            <string>order</string>
+                            <string>task</string>
                             <string>tag</string>
                             <string>activate_kw</string>
                           </tuple>
@@ -137,7 +137,7 @@ order.activate(tag=tag).updateAppliedRule(rule_id = \'default_order_rule\',activ
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Order_createOrderRule</string> </value>
+            <value> <string>Task_createOrderRule</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml
index c58fd34c48108a8a0d16ea184fa929767b6cd972..024824b3f327c27e82c817fa68555513a9d5b33a 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml
@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
-            <value> <string>Order_appliedToRelatedMovement</string> </value>
+            <value> <string>Task_appliedToRelatedMovement</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml
index b2170fb93d30502e869049a6d76d79c90f8d1a00..1727a34c42ad7bd057647e6796457c7f414229b8 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml
@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
-            <value> <string>Order_buildPackingList</string> </value>
+            <value> <string>Task_buildTaskReport</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/informDeliveryList.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/informDeliveryList.xml
deleted file mode 100644
index 977193c4f85174742bfd84af689ec79bf9d49225..0000000000000000000000000000000000000000
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/informDeliveryList.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>informDeliveryList</string> </value>
-        </item>
-        <item>
-            <key> <string>new_state_id</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml
index 528a79789810227cf4866736c637294bca277c52..b5fcd6620062269a282fbd46ce8679d884f02cf3 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml
@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
-            <value> <string>Order_createOrderRule</string> </value>
+            <value> <string>Task_createOrderRule</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml
index fd2a0b2c44bfb4c87f50e644641e5acbf0ac7014..3168d0f1fc1ad109e21b8c0316eb3629ac9114ea 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml
@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
-            <value> <string>Order_createOrderRule</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Task_createOrderRule</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 4c009fb2fb4ac259990d1c18054f58bfd246f37f..274ccca8ac98c5054b0d25975485dfad65ac8673 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-206
\ No newline at end of file
+209
\ No newline at end of file