2009-03-26 Guillaume

* update titles and descriptions in workflow states and transitions.
* use Started/Stopped instead of Open/Closed for project_workflow.
* use Closed instead of Delivered for task_report_workflow

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26163 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/states/invalidated.xml

@@ -25,7 +25,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Closed</string> </value>
+            <value> <string>Stopped</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/states/validated.xml

@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The project has been started</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -25,7 +25,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Open</string> </value>
+            <value> <string>Started</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Stop Project</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Close Project</string> </value>
+            <value> <string>Stop Project</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Stop Project Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/suspend.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Suspend Project</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/suspend_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Suspend Project Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Project</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Open Project</string> </value>
+            <value> <string>Start Project</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Project Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Requirement</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Reject</string> </value>
+            <value> <string>Cancel Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Requirement Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Requirement</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Confirm</string> </value>
+            <value> <string>Confirm Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Requirement Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/delete.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/delete_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Close Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Close Requirement</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Deliver</string> </value>
+            <value> <string>Close Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Close Requirement Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Plan Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Plan Requirement</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Ask for More Details</string> </value>
+            <value> <string>Plan Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Plan Requirement Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Processing Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Processing Requirement</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Start to Work on It</string> </value>
+            <value> <string>Start Processing Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Processing Requirement Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Stop Processing Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Stop Processing Requirement</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Finish the Work</string> </value>
+            <value> <string>Stop Processing Requirement</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Stop Processing Requirement Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/confirmed.xml

@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The task has been confirmed by the manager</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/delivered.xml

@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The task is over and has been checked and validated by a manager. There is nothing left to process on it.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -25,7 +25,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Delivered</string> </value>
+            <value> <string>Closed</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/started.xml

@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The task processing has been started by the assignee</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml

@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The assignee has set the task processing as over. It needs to be delivered by the manager.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/cancel.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/cancel_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Cancel</string> </value>
+            <value> <string>Cancel Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/confirm.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Will set the state as Confirmed.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/confirm_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Confirm</string> </value>
+            <value> <string>Confirm Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/deliver.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Close Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Close Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/deliver_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Close Task</string> </value>
+            <value> <string>Close Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/question_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Question</string> </value>
+            <value> <string>Ask Status to Assignee</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>As a question to the task Assignee to enquire about task progress</string> </value>
+            <value> <string>Ask a question to the task Assignee to enquire about task progress</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Question</string> </value>
+            <value> <string>Ask Status to Assignee Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -61,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Restart Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The task has been restarted by the manager.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Restart Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart_action.xml

@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>The task will return to started state.</string> </value>
+            <value> <string>The start is restarted by the manager</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Restart Task</string> </value>
+            <value> <string>Restart Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/start.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Start Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/start_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Start Task</string> </value>
+            <value> <string>Start Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/stop.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Finish Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Finish Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/stop_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Finish Task</string> </value>
+            <value> <string>Finish Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/auto_plan.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Auto Plan Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Auto Plan Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Cancel Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Cancel</string> </value>
+            <value> <string>Cancel Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Cancel</string> </value>
+            <value> <string>Cancel Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Confirm Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Confirm</string> </value>
+            <value> <string>Confirm Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Confirm</string> </value>
+            <value> <string>Confirm Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Delete</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete_action.xml

@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Delete</string> </value>
+            <value> <string>Delete Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Order Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>order is a workflow method which can be invoked from a script to set an object in order state.</string> </value>
+            <value> <string>The task has been ordered by a manager</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Order Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Order</string> </value>
+            <value> <string>Order Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>The Assignor of a Task may set a task a \'ordered\' by invoking the \'Order\' action. Ordered task still need to be confirmed before Task Report is generated.</string> </value>
+            <value> <string>The task has been ordered by a manager</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Order</string> </value>
+            <value> <string>Order Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Plan Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>plan is a workflow method which can be invoked from a script to set an object in planned state.</string> </value>
+            <value> <string>The task has been planned but not confirmed yet.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Plan Task</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml

@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Plan</string> </value>
+            <value> <string>Plan Task</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Plan</string> </value>
+            <value> <string>Plan Task Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>

bt5/erp5_project/bt/revision

-625
+627
\ No newline at end of file