diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml
index c9b9eca9b5597f4b673a22f6eacef91cd6c8f0e8..a0f2207449e431323c724b7f7a465c566d9c3435 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml
@@ -30,6 +30,16 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>creation_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
@@ -42,7 +52,11 @@
         </item>
         <item>
             <key> <string>initial_state</string> </key>
-            <value> <string>new</string> </value>
+            <value> <string>draft</string> </value>
+        </item>
+        <item>
+            <key> <string>manager_bypass</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -60,7 +74,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Incoming Events</string> </value>
+            <value> <string>Incoming and Outgoing Events</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_replyMailMessage.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_replyMailMessage.xml
index 9d018124879cd8b8dba25d0c58027debab64ff88..83183d9ebe0eb8646f110f1b19734ec5c356d94d 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_replyMailMessage.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_replyMailMessage.xml
@@ -68,16 +68,14 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>string_subject = \'\'\n
-for  letter in state_change.kwargs[\'reply_subject\']:\n
-  string_subject += letter\n
-message = state_change.kwargs[\'reply_body\']\n
+            <value> <string>message = state_change.kwargs[\'reply_body\']\n
+subject = state_change.kwargs[\'reply_subject\']\n
+recipient = state_change.kwargs[\'reply_to\']\n
+object = state_change[\'object\']\n
 \n
-state_change[\'object\'].MailHost.send(message, mto=state_change[\'object\'].getSender(), mfrom="info@nexedi.com",\n
-          subject=string_subject)\n
-\n
-#state_change[\'object\'].MailHost.send(message, mto="seb@nexedi.com", mfrom="info@nexedi.com",\n
-#          subject=string_subject)\n
+state_change[\'object\'].MailHost.send(message, mto=recipient, \n
+                                     mfrom=object.portal_preferences.getPreferredEventSenderEmail(),\n
+                                     subject=subject)\n
 </string> </value>
         </item>
         <item>
@@ -121,12 +119,12 @@ state_change[\'object\'].MailHost.send(message, mto=state_change[\'object\'].get
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>string_subject</string>
-                            <string>_getiter_</string>
                             <string>_getitem_</string>
                             <string>_getattr_</string>
-                            <string>letter</string>
                             <string>message</string>
+                            <string>subject</string>
+                            <string>recipient</string>
+                            <string>object</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/acknowledged.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/acknowledged.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b3296ccca74378fe80df3803cd04dd196b5a91a6
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/acknowledged.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Events in this state are incoming events or carbon copies of outgoing events sent to ERP5 CRM which have been acknowledged by a person, by a ticket supervisor or by a project manager.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>acknowledged</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Acknowledged</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>current_inventory</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/assigned.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/assigned.xml
index 7c88f30c7b406696d977d7d6f90308b6bd87b8a0..566bad1975401b11afc37864949eb81e0bc59ebe 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/assigned.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/assigned.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state are incoming or carbon copies of outgoing events which have been assigned to a ticket, a project or a person and which still need to be acknowledged.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -40,8 +40,12 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
-                <string>delete</string>
-                <string>delete_action</string>
+                <string>acknowledge</string>
+                <string>acknowledge_action</string>
+                <string>cancel</string>
+                <string>cancel_action</string>
+                <string>receive</string>
+                <string>receive_action</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/cancelled.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/cancelled.xml
index 3675b276ba8274f266522270937e515d5faacd65..be6527aa487f76f7529709edfeca1a40367bf752 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/cancelled.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/cancelled.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state are incoming or outgoing events which could not be further processed. The reason why processing was stopped should be defined in the workflow history as a text comment.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/deleted.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/deleted.xml
index febeb0fd137e7115a3ddc5cddd95a8b47668129e..82d4686aae27f92cf7cc46c9be2b0dcc2c9bfc4f 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/deleted.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/deleted.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state were deleted by the user as a result of clicking on the trash button.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/delivered.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/delivered.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6960f1c35b049eb7b1ff0bb668bfe888b0621b7f
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/delivered.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Events in this state are outgoing events which were sent to recipients and which recipients acknowledged their receival.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delivered</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Delivered</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>current_inventory</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/draft.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/draft.xml
new file mode 100644
index 0000000000000000000000000000000000000000..256b27af2a39d8fc3ef049086ef82463c10fafe2
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/draft.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Events in this state are being drafted by the user. Outgoing events must be validated through the Submit action. Incoming events must be validated through the Assign action.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>draft</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Draft</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple>
+                <string>assign</string>
+                <string>assign_action</string>
+                <string>cancel</string>
+                <string>cancel_action</string>
+                <string>create_sale_opportunity</string>
+                <string>create_sale_opportunity_action</string>
+                <string>create_support_request</string>
+                <string>create_support_request_action</string>
+                <string>delete</string>
+                <string>delete_action</string>
+                <string>plan</string>
+                <string>plan_action</string>
+                <string>receive</string>
+                <string>receive_automatic</string>
+                <string>start</string>
+                <string>start_action</string>
+                <string>user_assign</string>
+                <string>user_assign_action</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/expired.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/expired.xml
index 1eccd2e0dd598bc2e97816f562e8988becdbdc0a..05bc7b58680f3594949df96bd21f93f0f960e264 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/expired.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/expired.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state are incoming events or carbon copies of outgoing events which could not be processed on time.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -36,6 +36,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/new.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/new.xml
index a01c19518a325c77be7fabad41a0bc0ad75fb93a..e653baa5cb695811b559f078fdd664bfe9e16e38 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/new.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/new.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state are incoming events or carbon copies of outgoing events received through the email interface of ERP5 CRM.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/ordered.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/ordered.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1e7ebdab041b04eff61582baffb9609ca6fcb88c
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/ordered.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Events in this state are outgoing events which have been assigned and are waiting to be sent.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ordered</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Pending</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple>
+                <string>cancel</string>
+                <string>cancel_action</string>
+                <string>start</string>
+                <string>start_action</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>planned_order</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/planned.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/planned.xml
new file mode 100644
index 0000000000000000000000000000000000000000..99d96f7faa28965194f1d4dbecf6ed2acf960ba7
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/planned.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Events in this state are outgoing events which are waiting for the approval of the ticket manager who will eventually request them to be posted.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>planned</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Outgoing</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple>
+                <string>order</string>
+                <string>order_action</string>
+                <string>redraft</string>
+                <string>redraft_action</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>planned_order</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/responded.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/responded.xml
index afc0d21030a9892c4535e78bb8746fa847c9c3e8..d8003af931aa7ca2bc3965941f0782443dc65dcf 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/responded.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/responded.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state are incoming events or carbon copies of outgoing events which have been responded and which do not need further processing through assignment. </string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -39,10 +39,13 @@
         <item>
             <key> <string>transitions</string> </key>
             <value>
-              <tuple>
-                <string>respond</string>
-                <string>respond_action</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/started.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/started.xml
new file mode 100644
index 0000000000000000000000000000000000000000..714b9eabba302af65cc4b67b1470a14bc01e75ac
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/started.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Events in this state are outgoing events which were posted. Some events may be later delivered whenever the recipient acknowledges their receival.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>started</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Posted</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple>
+                <string>deliver</string>
+                <string>deliver_action</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>transit_inventory</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/trashed.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/trashed.xml
index bca6dbd218ea29ff06dc7378ac6cca881c8dc26a..4dd1b98d7c89403c5c926d783ea62202ecf7cbf4 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/trashed.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/trashed.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Events in this state are incoming events which should be considered as spam.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -40,13 +40,17 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
-                <string>assign</string>
-                <string>assign_action</string>
-                <string>respond</string>
-                <string>respond_action</string>
+                <string>receive</string>
+                <string>receive_action</string>
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>uid</string> </key>
             <value>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94a68c72606b3ae2a5c709df031ace0f78c2a030
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge.xml
@@ -0,0 +1,70 @@
+<?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>The acknowledge workflow method is the last logical transition for incoming events. It set the state to acknowledged.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>acknowledge</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>acknowledged</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e27a8d480bcc4d85bfb04c6ac843938d7fcc5d4
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml
@@ -0,0 +1,94 @@
+<?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>Acknowledge</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=acknowledge_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>acknowledge</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Acknowledge action to acknowledge incoming events and remove them from the Assigned event worklist.</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>acknowledge_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>Acknowledge</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign.xml
index eb83832b696e900c40ce7f11fc965cd8bce7a244..2ec6e76770dc3aae4fe1bcaa464210ca3c6fb402 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The assign logical transition set the workflow state to assigned.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign_action.xml
index 14db90d8b00d447abbc1d5ac6b77d48b6711ac86..df38e6212bfc989ee213d8bf88d1c7aa182c0568 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/assign_action.xml
@@ -28,7 +28,7 @@
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
-            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=assign_action</string> </value>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=assign_action</string> </value>
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
@@ -36,12 +36,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the Assign action after defining the person in charge of processing this event and the ticket or project it is related to. The event will then be moved to the assigned worklist and wait for acknowledgement.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Assign</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -67,4 +67,27 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/cancel.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/cancel.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5681c384c84cb9875ee5d94b7cc0df60edc19a71
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/cancel.xml
@@ -0,0 +1,70 @@
+<?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>The cancel logical transition sets the state to cancelled. It can be used to stop the processing of an event yet keep of trace of its existence.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>cancel</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>cancelled</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/cancel_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/cancel_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5b6b21036d00c28ec9350d023b4c8b6502bdff87
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/cancel_action.xml
@@ -0,0 +1,95 @@
+<?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>Cancel</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>cancel</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Cancel action to interrupt the processing of an event yet keep of trace of its existence (unlike the  Delete action).</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>cancel_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>Cancel</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity.xml
index a6d096816d11f84e86f5b15cac4ba3e8a39eae32..2cb045d1110000b617d21128942e5c6356646f09 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The create_sale_opportunity logical transition creates a sale opportunity ticket based on the event properties and associates the event to it.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity_action.xml
index 6ad270e89d0d80e4881d2083327d1b090bc2b9e3..1b910c1ada3324fbb877b241accf91a327943f44 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_sale_opportunity_action.xml
@@ -40,12 +40,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The Create Sale Opportunity action creates a sale opportunity based on and related to the current event.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -62,7 +62,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Create Sale Opportunity</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -71,4 +71,29 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request.xml
index a1e618c31c94ce560c9c605dc907840c4c8e9bcc..4cf6159a103aa495539603e3a49d23be6d452435 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The create_support_request logical transition creates a support request ticket based on the event properties and associates the event to it.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request_action.xml
index 4595bfe9a0a112bde7e22ad600bc39b5c4f61581..c55f7f7a152f0afc69a4c2ff9882f164fe26cff9 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/create_support_request_action.xml
@@ -40,12 +40,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The Create Support Request action creates a sale opportunity based on and related to the current event.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -62,7 +62,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Create Support Request</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -71,4 +71,29 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml
index 3bb7f53972dbdd146bf95aba74c598bba4b8c43b..0da29b0e6152916fc71a7aecceedca29d3a4f6c6 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml
@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The delete logical transition sets the state of the event to deleted.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml
index bb665459602a8ce41d1de8240b4b66d08c62ed2a..bdeab2dbc2f725251fcf5c2ef90849bee772920f 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml
@@ -42,12 +42,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The Delete action is invoked whenever the use uses the trash icon to delete a document.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -64,7 +64,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>
@@ -73,4 +73,27 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/deliver.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/deliver.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1c51af9ab45335e8885895ee16df51d47e50419
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/deliver.xml
@@ -0,0 +1,70 @@
+<?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>The deliver logical transition set the event to delivered, which is the last state for ougoing events.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>deliver</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>delivered</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/deliver_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/deliver_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dcf335c7b9817cb46cfef017f5ff2c6dbe54a5ca
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/deliver_action.xml
@@ -0,0 +1,93 @@
+<?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>Deliver</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=deliver_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>deliver</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>The Deliver action sets the event to delivered. It should be invoked to notify that an outgoing event has been received by its recipient. Use the comments to define the nature of the delivery proof.</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>deliver_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>Deliver</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire.xml
index d97ac30a2509ffac4869f79180ceff54f531a883..e5c525634af6db052557bccc892ca76aec741c6e 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The expire logical transition sets the event state to expired.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Expire</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire_action.xml
index 92c3cea0f71b8fa9444f6c4866bcef95bc05aa22..cd0757f569fea48b868440eb10cceaf3a48472b6 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire_action.xml
@@ -36,12 +36,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the Expire action to notify that an event could not be processed on time and that it is now too late to be processed. Only Assignor can expire an event since it might be an alarming sign.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Expire</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -67,4 +67,27 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded_action.xml
index bc5d59103b84c5b465a77215007ed3474d495612..06bf14f496f1b161aab8c7d082d922108266d829 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded_action.xml
@@ -32,16 +32,16 @@
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
-            <value> <string>mark_responded</string> </value>
+            <value> <string>respond</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the Mark Responded action to mark the event as responded and stop further processing. This is the action to use for carbon copied outgoing messages which were sent in response to a query which does not need any processing through ticket.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Mark Responded</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -67,4 +67,29 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/order.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/order.xml
new file mode 100644
index 0000000000000000000000000000000000000000..75bdfba8939861d5dfbd603d51524b9e4a3f2e59
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/order.xml
@@ -0,0 +1,70 @@
+<?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>The order logical transition sets the event state to ordered.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>order</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>ordered</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/order_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/order_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b9aa8f10545eaa73a781308c9487bdc0c0033fb7
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/order_action.xml
@@ -0,0 +1,93 @@
+<?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>Request</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>order</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Request action to request the assigned operator to post / send / call an outgoing event.</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>order_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>Request</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/plan.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/plan.xml
new file mode 100644
index 0000000000000000000000000000000000000000..73a0674bf1348b0dfb96555f8a95eb8c2f5f870e
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/plan.xml
@@ -0,0 +1,70 @@
+<?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>The plan logical transition sets the event state to planned.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>plan</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>planned</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/plan_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/plan_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..13357451c38985837032dc9b7e5e88699892206d
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/plan_action.xml
@@ -0,0 +1,95 @@
+<?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>Submit</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=plan_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>plan</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Submit action to validate outgoing events and request their transmission.</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>plan_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>Submit</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive.xml
similarity index 89%
rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded.xml
rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive.xml
index 8e827409a37cdc04ef833c6c856dacdde327fd8e..989361b3db3251fb8f34a0ebc831da5420e85fdb 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/mark_responded.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The receivel logical transition sets the event state to new</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -46,11 +46,11 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>mark_responded</string> </value>
+            <value> <string>receive</string> </value>
         </item>
         <item>
             <key> <string>new_state_id</string> </key>
-            <value> <string>responded</string> </value>
+            <value> <string>new</string> </value>
         </item>
         <item>
             <key> <string>script_name</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee53acd4937cd5ec73a265f9659d2e22f1f28cb4
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive_action.xml
@@ -0,0 +1,94 @@
+<?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>Reset</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=reset_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>The Reset action resets to new the state of an incoming event which was mistakenly assigned.</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>receive_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>Reset</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive_automatic.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive_automatic.xml
new file mode 100644
index 0000000000000000000000000000000000000000..692d302bc4229d694ae69ee127b00e267c32a64d
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/receive_automatic.xml
@@ -0,0 +1,110 @@
+<?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>The receive automatic transition sets the event state to new whenever this events contains an email file.</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>receive_automatic</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>new</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>0</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>here/hasFile</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/redraft.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/redraft.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5d269823bbf93952b7d82cf497310f2401f97daf
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/redraft.xml
@@ -0,0 +1,70 @@
+<?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>The redraft logical transition sets the event state to draft.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>redraft</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>draft</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/redraft_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/redraft_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c8c71d4cfceb9d2bf3dde01e57e91e6b1ec6f89
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/redraft_action.xml
@@ -0,0 +1,93 @@
+<?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>Redraft</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?field_my_workflow_action=redraft_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>redraft</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Redraft to set a mistakenly processed event back to draft.</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>redraft_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>Redraft</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond.xml
index 777306065326f5071648028cc65ae1a15225ef9b..eab9363b511ff9eabc9c752fc3da9748c548423f 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The respond logical action sets the event state to responded.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond_action.xml
index 3ccc098976eaacdadcc19b12dd0543ade6a4f342..d43523e17d01381ecd3c4b6de498a278767b4e0d 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond_action.xml
@@ -24,11 +24,11 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Respond</string> </value>
+            <value> <string>Reply by Email</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
-            <value> <string>%(content_url)s/EventWorkflow_respond?field_my_workflow_action=respond_action</string> </value>
+            <value> <string>%(content_url)s/Event_viewRespondDialog?workflow_action=respond_action</string> </value>
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
@@ -36,12 +36,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the Reply by Email action to reply to an incoming event by email and stop further processing.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Reply by Email</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -67,4 +67,29 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam.xml
index f5af6a10e4f16aff1b8b876a42d4b411b31de0c6..fced9ccc62a9adb2bc965e8c4f6a1f2335906a52 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The spam logical transition sets the event state to trashed.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam_action.xml
index dbe09c4c4e1461188e3635ebc598cd637a353aba..2b2650114371e59bd21b70d09511dfc3e4b79437 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/spam_action.xml
@@ -36,12 +36,12 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the This is Spam action to mark the event as spam.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>This is Spam</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -67,4 +67,27 @@
       </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/start.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/start.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ef984706fe5f41c752da19ff7a390c22d47eb85
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/start.xml
@@ -0,0 +1,70 @@
+<?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>The start logical transition sets the event start to started.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>start</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>started</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_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/start_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/start_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..084dfb8e657c3247f029c627333985b932b9803a
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/start_action.xml
@@ -0,0 +1,94 @@
+<?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>Post</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=start_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>start</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Post action to send a message, place a phone call or post a not.</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>start_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>Post</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign.xml
index d199117c14433ee5780796ce336d344e99faba5e..ac7d0ab5081b4def8f7fee6cffce3742324948f2 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>XXX</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign_action.xml
index 65016653024318403f560cce3cadf8f5469773fd..d11cdf7fb1fa15903f9adecb3729b471c02f07a8 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/user_assign_action.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>XXX</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/portal_type.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/portal_type.xml
deleted file mode 100644
index 1bdbeb71b474bbd509df56ab7da29bf76045fd3e..0000000000000000000000000000000000000000
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/portal_type.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_expr</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_value</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>for_catalog</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>for_status</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>portal_type</string> </value>
-        </item>
-        <item>
-            <key> <string>info_guard</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>update_always</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/assigned_events.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/assigned_events.xml
new file mode 100644
index 0000000000000000000000000000000000000000..358c6ee7fc275461988d766529b65a9c6e909111
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/assigned_events.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Worklists</string>
+          <string>WorklistDefinition</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>global</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string>Assigned Events (%(count)s)</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+event_module?simulation_state=assigned&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Assigned Events</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>assigned_events</string> </value>
+        </item>
+        <item>
+            <key> <string>var_matches</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>simulation_state</string> </key>
+                    <value>
+                      <tuple>
+                        <string>assigned</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml
index 958e132dd482c4aa4f867a08c57750e2fe4bac90..caa900a4e20e51df8323b62379c082daf8564274 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-event_module?simulation_state=new&local_roles=%(local_roles)s&reset=1
+event_module?simulation_state=new&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -41,7 +41,7 @@ event_module?simulation_state=new&local_roles=%(local_roles)s&reset=1
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -49,21 +49,38 @@ event_module?simulation_state=new&local_roles=%(local_roles)s&reset=1
             <value> <string>new_events</string> </value>
         </item>
         <item>
-            <key> <string>uid</string> </key>
+            <key> <string>var_matches</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </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>var_matches</string> </key>
+            <key> <string>roles</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
         <tuple>
@@ -79,17 +96,6 @@ event_module?simulation_state=new&local_roles=%(local_roles)s&reset=1
             <key> <string>_container</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>portal_type</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Mail Message</string>
-                        <string>Phone Call</string>
-                        <string>Incoming Fax</string>
-                        <string>Incoming Letter</string>
-                      </tuple>
-                    </value>
-                </item>
                 <item>
                     <key> <string>simulation_state</string> </key>
                     <value>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/responded_events.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/pending_events.xml
similarity index 70%
rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/responded_events.xml
rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/pending_events.xml
index d22d01babdec1212ad8d631af7b71a5682fe0bb0..dd3c97223aaa4d0b6f54ee4b8d632f3c856abb64 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/responded_events.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/pending_events.xml
@@ -18,52 +18,70 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>global</string> </value>
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Responded Events (%(count)s)</string> </value>
+            <value> <string>Pending Events (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-event_module?simulation_state=responded&local_roles=%(local_roles)s&reset=1
+event_module?simulation_state=pending&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Responded Events</string> </value>
+            <value> <string>Pending Events</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>responded_events</string> </value>
+            <value> <string>pending_events</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
         <tuple>
@@ -79,22 +97,11 @@ event_module?simulation_state=responded&local_roles=%(local_roles)s&reset=1
             <key> <string>_container</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>portal_type</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Mail Message</string>
-                        <string>Phone Call</string>
-                        <string>Incoming Fax</string>
-                        <string>Incoming Letter</string>
-                      </tuple>
-                    </value>
-                </item>
                 <item>
                     <key> <string>simulation_state</string> </key>
                     <value>
                       <tuple>
-                        <string>responded</string>
+                        <string>pending</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml
index eb9844d1ab5bd107591f3a5b0e38203488b43d42..afcd48402886a8b26bd15df71cab7e7ad55962c5 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml
@@ -71,11 +71,10 @@
             <value> <string>string_subject = \'Re: %s\' % state_change[\'object\'].getTitle()\n
 message = state_change.kwargs[\'comment\']\n
 \n
+# XXX Wrong way to get email or even to send an email\n
 PersonModule_viewPersonList = context.getClientValueList(portal_type="Person") # should become getDestinationSectionList()\n
 email_list = map(lambda x:x.getDefaultEmailText(), PersonModule_viewPersonList)\n
-\n
-# XXX FIXME mfrom value is not good at all\n
-state_change[\'object\'].MailHost.send(message, mto=email_list, mfrom="info@nexedi.com",\n
+state_change[\'object\'].MailHost.send(message, mto=email_list, mfrom=context.portal_preferences.getPreferredEventSenderEmail(),\n
                                   subject=string_subject)\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml
index 82131a168672ed02da73b3a8ed45a705c902aa77..b1cb23fa9b462115bef622b2fd5648ea66ea87a2 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml
@@ -36,6 +36,10 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>The ticket workflow keeps track of ticket processing. A ticket is created in draft state. It is then submitted by its author (Owner) or operator (Assignee) and waits for futher approval. The ticket manager (Assignor) eventually approves the ticket. The ticket is then open. The ticket can be closed by the ticket mananger or by the ticket operator.</string> </value>
+        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/cancelled.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/cancelled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18cfa89896105615ec265c885e09b5bb4f7e9897
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/cancelled.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Tickets in this state are tickets which have been rejected or which processing has been stopped.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>cancelled</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Cancelled</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Associate</string>
+                        <string>Auditor</string>
+                        <string>Author</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Associate</string>
+                        <string>Auditor</string>
+                        <string>Author</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4f2b96568991ed60b69e4c5ab0e24c8ba890d94d
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Tickets in this state can only be accessed and viewed by the the portal Manager.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>deleted</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Deleted</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml
index 20361e65019ba79e604874d7d3523b8324052080..124f2560bedbc588dc1c195587791c237b44725b 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Tickets in draft state are being prepared by their original author (Owner) or operator (Assignee).</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -40,11 +40,23 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
+                <string>cancel</string>
+                <string>cancel_action</string>
+                <string>delete</string>
+                <string>delete_action</string>
+                <string>submit</string>
+                <string>submit_action</string>
                 <string>validate</string>
                 <string>validate_action</string>
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>uid</string> </key>
             <value>
@@ -76,51 +88,28 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
-                        <string>Associate</string>
-                        <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
-                <item>
-                    <key> <string>Add portal content</string> </key>
-                    <value>
-                      <list>
-                        <string>Reviewer</string>
-                      </list>
-                    </value>
-                </item>
                 <item>
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
-                        <string>Author</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
-                <item>
-                    <key> <string>Review portal content</string> </key>
-                    <value>
-                      <list>
-                        <string>Reviewer</string>
-                      </list>
-                    </value>
-                </item>
                 <item>
                     <key> <string>View</string> </key>
                     <value>
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
-                        <string>Associate</string>
-                        <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml
index 8b36a016672b923bb23085a2f0185ff79e4983dc..eb78aed3584c12296c1ce9cd45933c519bdf1809 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Tickets in this state have been fully processed and no longer need further processing.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -34,7 +34,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Invalidated</string> </value>
+            <value> <string>Closed</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
@@ -45,6 +45,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
@@ -72,22 +78,14 @@
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>Modify portal content</string> </key>
                     <value>
-                      <tuple>
-                        <string>Assignee</string>
-                        <string>Assignor</string>
-                        <string>Author</string>
-                        <string>Manager</string>
-                        <string>Owner</string>
-                      </tuple>
+                      <tuple/>
                     </value>
                 </item>
                 <item>
@@ -98,9 +96,7 @@
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/submitted.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/submitted.xml
new file mode 100644
index 0000000000000000000000000000000000000000..da87f72025d0f7e09f8669cdbc85dc179f6ec254
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/submitted.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Tickets in this state are waiting for approval from the Ticket manager before being further processed.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>submitted</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Submitted</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple>
+                <string>cancel</string>
+                <string>cancel_action</string>
+                <string>validate</string>
+                <string>validate_action</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml
index 3bc5795e2c5c38ae88c236a4650eb04df7796e1d..b01e8ea98c4a5b00c6b841868d3f99b5c5b75a6e 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Tickets in this state require processing.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -34,7 +34,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Validated</string> </value>
+            <value> <string>Open</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
@@ -45,6 +45,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>uid</string> </key>
             <value>
@@ -78,9 +84,7 @@
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -90,9 +94,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -104,9 +106,7 @@
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6622b21b0cd6079895685e86c81f75fcb161f03a
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel.xml
@@ -0,0 +1,70 @@
+<?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>The cancel logical transition sets the ticket state to cancelled.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>cancel</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>cancelled</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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0e29d907257b58a34127c00b40797215bf119e2d
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel_action.xml
@@ -0,0 +1,95 @@
+<?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>Cancel</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>cancel</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Cancel action to stop any further processing for this ticket yet keep a trace of it (unlike the Delete action).</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>cancel_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>Cancel</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete.xml
new file mode 100644
index 0000000000000000000000000000000000000000..754c920791cb2b0e73ebfb7faa3d187b3e437f24
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete.xml
@@ -0,0 +1,70 @@
+<?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>The delete logical transition sets the ticket state to deleted.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delete</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>deleted</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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a1b0a755568981df882ccb4d452874594b4abefd
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete_action.xml
@@ -0,0 +1,70 @@
+<?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>delete</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Delete action to delete tickets. This action can be invoked through the trash icon is list mode. It is not displayed in the action menu.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delete_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>Delete</string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml
index 1593b509f44c43db956474a1cd9d4f2bda0cecba..021d84e0083160bf55e7da3f3d2ae7700385657e 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The invalidate logical transition sets the ticket state to invalidate.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml
index fb58b08d074e023bc8da619ca1476340bdb087fa..c4417cf1e1d372eb34e390227d284fb4b9fc1088 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml
@@ -24,7 +24,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Invalidate</string> </value>
+            <value> <string>Close</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the CLose action to close an open ticket and mark the end of ticket processing.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Close</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ed33711989fd4c089defa076f4d48bb1c992391
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.xml
@@ -0,0 +1,70 @@
+<?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>The submit logical transition set the Ticket state to submitted.</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>submit</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>submitted</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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb284c10512badabe7180fd6c5959d1d770f8bec
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_action.xml
@@ -0,0 +1,95 @@
+<?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>Submit</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=submit_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>submit</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Use the Submit action to request the approval of the Ticket manager (Assignor) and open the Ticket.</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>submit_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>Submit</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>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml
index f1ee3e5e5fded73d88ff2174f4e1e25044778498..3d23d936b97b3b92bb00b66a1f176c6d76d5f6e2 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>The validate logical transition sets the Ticket state to validated.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml
index deaaf8529725c5ec8f746df73b754f6b608d8837..058f64e6f56a17a1ca919e8ad4215b4786d349ef 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml
@@ -24,7 +24,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Validate</string> </value>
+            <value> <string>Open</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -36,7 +36,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Use the Open action to open a Ticket.</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Open</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -84,7 +84,6 @@
             <value>
               <tuple>
                 <string>Assignor</string>
-                <string>Assignee</string>
               </tuple>
             </value>
         </item>