diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_initial_contacts.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_draft_opportunity_list.xml
similarity index 70%
rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_initial_contacts.xml
rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_draft_opportunity_list.xml
index eeb0d844815f774f4e9d7567958a7fa0eaf31f3f..2ec0daf076ba76ebb1c8aaeb1bed8890f1fef580 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_initial_contacts.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_draft_opportunity_list.xml
@@ -21,59 +21,70 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Initial Contacts (%(count)s)</string> </value>
+ <value> <string>Sale Opportunities to Validate (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-sale_opportunity_module?simulation_state=contacted&local_roles=%(local_roles)s&reset=1
+sale_opportunity_module/view?simulation_state=draft&local_roles=Owner
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Initial Contacts</string> </value>
+ <value> <string></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>0_initial_contacts</string> </value>
+ <value> <string>0_draft_opportunity_list</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>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </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>Owner</string>
+ </tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
+ <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
@@ -88,7 +99,7 @@ sale_opportunity_module?simulation_state=contacted&local_roles=%(local_roles)s&r
<key> <string>simulation_state</string> </key>
<value>
<tuple>
- <string>contacted</string>
+ <string>draft</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_submitted_opportunity_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_submitted_opportunity_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f607b8caa766e193b2eafea80896f6d4d1b38c57
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_submitted_opportunity_list.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+ <tuple/>
+ </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>Submitted Sale Opportunities to Validate (%(count)s)</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+sale_opportunity_module/view?simulation_state=submitted&local_roles=Assignor
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>1_submitted_opportunity_list</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>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value>
+ <tuple>
+ <string>Sale Opportunity</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state</string> </key>
+ <value>
+ <tuple>
+ <string>submitted</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_initial_contact_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_initial_contact_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b2ad3a7c6adf1ef7272efa9237629ff3bf08bd38
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_initial_contact_list.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+ <tuple/>
+ </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>Sale Opportunities to Qualify (%(count)s)</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+sale_opportunity_module/view?simulation_state=contacted&local_roles:list=Assignee&local_roles:list=Assignor
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>2_initial_contact_list</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>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </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>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value>
+ <tuple>
+ <string>Sale Opportunity</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state</string> </key>
+ <value>
+ <tuple>
+ <string>contacted</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_enquiries.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/3_enquired_opportunity_list.xml
similarity index 70%
rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_enquiries.xml
rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/3_enquired_opportunity_list.xml
index 62dc6af116d8c6e3f942526538281f6c3e818e6e..432ef96308a29714a496a6b6877e77d7f1dc394e 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_enquiries.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/3_enquired_opportunity_list.xml
@@ -21,59 +21,71 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
- <value> <string>Sales Enquiries (%(count)s)</string> </value>
+ <value> <string>Offers to Send (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-sale_opportunity_module?simulation_state=enquired&local_roles=%(local_roles)s&reset=1
+sale_opportunity_module/view?simulation_state=enquired&local_roles:list=Assignee&local_roles:list=Assignor
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Sales Enquiries</string> </value>
+ <value> <string></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>1_enquiries</string> </value>
+ <value> <string>3_enquired_opportunity_list</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>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </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>Assignee</string>
+ <string>Assignor</string>
+ </tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
+ <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_pending_offers.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/4_pending_opportunity_list.xml
similarity index 72%
rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_pending_offers.xml
rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/4_pending_opportunity_list.xml
index f2b37a26c05c65e71c547a5997d536d8be5b0098..fc2648512e04964cac14d1ecba87c2c682b1ca90 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_pending_offers.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/4_pending_opportunity_list.xml
@@ -15,12 +15,6 @@
<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>
@@ -33,28 +27,28 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-sale_opportunity_module?simulation_state=offered&local_roles=%(local_roles)s&reset=1
+sale_opportunity_module/view?simulation_state=offered&local_roles:list=Assignee&local_roles:list=Assignor
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Pending Offers</string> </value>
+ <value> <string></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>2_pending_offers</string> </value>
+ <value> <string>4_pending_opportunity_list</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>
@@ -63,17 +57,35 @@ sale_opportunity_module?simulation_state=offered&local_roles=%(local_roles)s&res
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Persistence</string>
- <string>PersistentMapping</string>
- </tuple>
- <none/>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </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>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_container</string> </key>
+ <key> <string>data</string> </key>
<value>
<dictionary>
<item>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index 1edbdbab424f88cbead2031e6ebbd898365e68ec..cb37cb5c1fb749a2eaad380460a926969564408e 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-185
\ No newline at end of file
+186
\ No newline at end of file