From 04e040adb8f5a2c89f57c6ca96515a5c5d58e87f Mon Sep 17 00:00:00 2001 From: Thierry Brettnacher <tb@nexedi.com> Date: Wed, 8 Nov 2006 13:12:38 +0000 Subject: [PATCH] Improvements in the event workflow and sale opportunity workflow: - added delete action - added follow action for sale opportunities - added new worklists git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11202 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../event_workflow/states/assigned.xml | 9 ++ .../event_workflow/states/cancelled.xml | 20 ++++ .../event_workflow/states/deleted.xml | 54 +++++++++ .../event_workflow/states/new.xml | 8 ++ .../event_workflow/transitions/delete.xml | 76 +++++++++++++ .../transitions/delete_action.xml | 76 +++++++++++++ .../event_workflow/transitions/expire.xml | 25 +--- .../event_workflow/variables/portal_type.xml | 66 +++++++++++ .../worklists/new_events.xml} | 51 ++++----- .../worklists/responded_events.xml | 107 ++++++++++++++++++ .../states/contacted.xml | 4 + .../states/deleted.xml | 54 +++++++++ .../states/enquired.xml | 2 + .../states/expired.xml | 2 + .../states/offered.xml | 2 + .../states/rejected.xml | 2 + .../sale_opportunity_workflow/states/sold.xml | 2 + .../transitions/delete.xml | 76 +++++++++++++ .../transitions/delete_action.xml | 76 +++++++++++++ .../transitions/follow.xml | 76 +++++++++++++ .../transitions/follow_action.xml | 76 +++++++++++++ .../variables/portal_type.xml | 66 +++++++++++ ...al_contacts.xml => 0_initial_contacts.xml} | 44 +++---- .../worklists/1_enquiries.xml} | 20 +++- .../worklists/2_pending_offers.xml | 104 +++++++++++++++++ bt5/erp5_crm/bt/revision | 2 +- 26 files changed, 1007 insertions(+), 93 deletions(-) create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/deleted.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/portal_type.xml rename bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/{sale_opportunity_workflow/worklists/enquiries.xml => event_workflow/worklists/new_events.xml} (67%) create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/responded_events.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/deleted.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete_action.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow_action.xml create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/variables/portal_type.xml rename bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/{initial_contacts.xml => 0_initial_contacts.xml} (71%) rename bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/{event_workflow/worklists/new.xml => sale_opportunity_workflow/worklists/1_enquiries.xml} (76%) create mode 100644 bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_pending_offers.xml 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 a7a4fc8142..7c88f30c7b 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 @@ -38,6 +38,15 @@ </item> <item> <key> <string>transitions</string> </key> + <value> + <tuple> + <string>delete</string> + <string>delete_action</string> + </tuple> + </value> + </item> + <item> + <key> <string>type_list</string> </key> <value> <tuple/> </value> 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 e708a89b62..3675b276ba 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 @@ -18,10 +18,30 @@ <none/> </value> </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>id</string> </key> <value> <string>cancelled</string> </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> 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 new file mode 100644 index 0000000000..febeb0fd13 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/states/deleted.xml @@ -0,0 +1,54 @@ +<?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>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>deleted</string> </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> +</ZopeData> 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 6b15f1c591..a01c19518a 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 @@ -46,6 +46,8 @@ <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>expire</string> <string>expire_action</string> <string>mark_responded</string> @@ -59,6 +61,12 @@ </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/delete.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml new file mode 100644 index 0000000000..3bb7f53972 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete.xml @@ -0,0 +1,76 @@ +<?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>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>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/event_workflow/transitions/delete_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml new file mode 100644 index 0000000000..bb66545960 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/delete_action.xml @@ -0,0 +1,76 @@ +<?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>_owner</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>Delete</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=delete_action</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></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></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/event_workflow/transitions/expire.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/expire.xml index f84632d28f..d97ac30a25 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 @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <none/> </value> </item> <item> @@ -67,27 +67,4 @@ </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/variables/portal_type.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/portal_type.xml new file mode 100644 index 0000000000..1bdbeb71b4 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/portal_type.xml @@ -0,0 +1,66 @@ +<?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/sale_opportunity_workflow/worklists/enquiries.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml similarity index 67% rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/enquiries.xml rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml index a1394579bd..958e132dd4 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/enquiries.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new_events.xml @@ -24,29 +24,29 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Sales Enquiries (%(count)s)</string> </value> + <value> <string>New Events (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewSearchResultList?opportunity_state=enquired&local_roles=%(local_roles)s&reset=1 +event_module?simulation_state=new&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Sales enquiries</string> </value> + <value> <string>New Events</string> </value> </item> <item> <key> <string>guard</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <none/> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>enquiries</string> </value> + <value> <string>new_events</string> </value> </item> <item> <key> <string>uid</string> </key> @@ -57,37 +57,13 @@ Base_viewSearchResultList?opportunity_state=enquired&local_roles=%(local_roles)s <item> <key> <string>var_matches</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</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>Assignor</string> - <string>Assignee</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> @@ -104,10 +80,21 @@ Base_viewSearchResultList?opportunity_state=enquired&local_roles=%(local_roles)s <value> <dictionary> <item> - <key> <string>opportunity_state</string> </key> + <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>enquired</string> + <string>new</string> </tuple> </value> </item> 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/responded_events.xml new file mode 100644 index 0000000000..d22d01babd --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/responded_events.xml @@ -0,0 +1,107 @@ +<?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>_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> + </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 + +]]></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Responded Events</string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>responded_events</string> </value> + </item> + <item> + <key> <string>var_matches</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </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>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> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/contacted.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/contacted.xml index 4eb258e9ef..34cedea317 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/contacted.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/contacted.xml @@ -34,12 +34,16 @@ <key> <string>transitions</string> </key> <value> <tuple> + <string>delete</string> + <string>delete_action</string> <string>email_offer</string> <string>email_offer_action</string> <string>enquire</string> <string>enquire_action</string> <string>expire</string> <string>expire_action</string> + <string>follow</string> + <string>follow_action</string> <string>offer</string> <string>offer_action</string> <string>sell</string> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/deleted.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/deleted.xml new file mode 100644 index 0000000000..febeb0fd13 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/deleted.xml @@ -0,0 +1,54 @@ +<?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>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>deleted</string> </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> +</ZopeData> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/enquired.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/enquired.xml index 8749f645b9..ffd4177e77 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/enquired.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/enquired.xml @@ -38,6 +38,8 @@ <string>email_offer_action</string> <string>expire</string> <string>expire_action</string> + <string>follow</string> + <string>follow_action</string> <string>offer</string> <string>offer_action</string> </tuple> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/expired.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/expired.xml index 58d4d4772c..5c2a3062f8 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/expired.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/expired.xml @@ -34,6 +34,8 @@ <key> <string>transitions</string> </key> <value> <tuple> + <string>follow</string> + <string>follow_action</string> <string>reset</string> <string>reset_action</string> </tuple> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/offered.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/offered.xml index 41300c6fe0..7f16540db2 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/offered.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/offered.xml @@ -38,6 +38,8 @@ <string>enquire_action</string> <string>expire</string> <string>expire_action</string> + <string>follow</string> + <string>follow_action</string> <string>reject</string> <string>reject_action</string> <string>sell</string> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/rejected.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/rejected.xml index f01c2d2a22..0d20297782 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/rejected.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/rejected.xml @@ -34,6 +34,8 @@ <key> <string>transitions</string> </key> <value> <tuple> + <string>follow</string> + <string>follow_action</string> <string>reset</string> <string>reset_action</string> </tuple> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/sold.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/sold.xml index 67e72ec07d..149bfdbc7b 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/sold.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/states/sold.xml @@ -34,6 +34,8 @@ <key> <string>transitions</string> </key> <value> <tuple> + <string>follow</string> + <string>follow_action</string> <string>reset</string> <string>reset_action</string> </tuple> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete.xml new file mode 100644 index 0000000000..3bb7f53972 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete.xml @@ -0,0 +1,76 @@ +<?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>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>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/sale_opportunity_workflow/transitions/delete_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete_action.xml new file mode 100644 index 0000000000..bb66545960 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/delete_action.xml @@ -0,0 +1,76 @@ +<?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>_owner</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>Delete</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=delete_action</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></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></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/sale_opportunity_workflow/transitions/follow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow.xml new file mode 100644 index 0000000000..a109d5c52e --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow.xml @@ -0,0 +1,76 @@ +<?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>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>follow</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow_action.xml new file mode 100644 index 0000000000..c01eccd5a0 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/follow_action.xml @@ -0,0 +1,76 @@ +<?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>_owner</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>Follow</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=follow_action</string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string>follow</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>follow_action</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/variables/portal_type.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/variables/portal_type.xml new file mode 100644 index 0000000000..1bdbeb71b4 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/variables/portal_type.xml @@ -0,0 +1,66 @@ +<?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/sale_opportunity_workflow/worklists/initial_contacts.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_initial_contacts.xml similarity index 71% rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/initial_contacts.xml rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_initial_contacts.xml index a77dac3ca3..b4c6bff53e 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/initial_contacts.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/0_initial_contacts.xml @@ -30,23 +30,23 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewSearchResultList?opportunity_state=contacted&local_roles=%(local_roles)s&reset=1 +sale_opportunity_module?simulation_state=contacted&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>First Contacts</string> </value> + <value> <string>Initial Contacts</string> </value> </item> <item> <key> <string>guard</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <none/> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>initial_contacts</string> </value> + <value> <string>0_initial_contacts</string> </value> </item> <item> <key> <string>uid</string> </key> @@ -57,37 +57,13 @@ Base_viewSearchResultList?opportunity_state=contacted&local_roles=%(local_roles) <item> <key> <string>var_matches</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</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>Assignor</string> - <string>Assignee</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> @@ -104,7 +80,15 @@ Base_viewSearchResultList?opportunity_state=contacted&local_roles=%(local_roles) <value> <dictionary> <item> - <key> <string>opportunity_state</string> </key> + <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> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_enquiries.xml similarity index 76% rename from bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new.xml rename to bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_enquiries.xml index bf56eba7db..3193e4cd66 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/new.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/1_enquiries.xml @@ -24,19 +24,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>New Event (%(count)s)</string> </value> + <value> <string>Sales Enquiries (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewSearchResultList?event_state=new&reset=1 +sale_opportunity_module?simulation_state=enquired&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>New Event</string> </value> + <value> <string>Sales Enquiries</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -46,7 +46,7 @@ Base_viewSearchResultList?event_state=new&reset=1 </item> <item> <key> <string>id</string> </key> - <value> <string>new</string> </value> + <value> <string>1_enquiries</string> </value> </item> <item> <key> <string>uid</string> </key> @@ -80,10 +80,18 @@ Base_viewSearchResultList?event_state=new&reset=1 <value> <dictionary> <item> - <key> <string>event_state</string> </key> + <key> <string>portal_type</string> </key> <value> <tuple> - <string>new</string> + <string>Sale Opportunity</string> + </tuple> + </value> + </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>enquired</string> </tuple> </value> </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/2_pending_offers.xml new file mode 100644 index 0000000000..64a6d694f4 --- /dev/null +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/2_pending_offers.xml @@ -0,0 +1,104 @@ +<?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>_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>Pending Offers (%(count)s)</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +sale_opportunity_module?simulation_state=offered&local_roles=%(local_roles)s&reset=1 + +]]></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Pending Offers</string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>2_pending_offers</string> </value> + </item> + <item> + <key> <string>var_matches</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </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>portal_type</string> </key> + <value> + <tuple> + <string>Sale Opportunity</string> + </tuple> + </value> + </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>offered</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index 301160a930..9d607966b7 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -8 \ No newline at end of file +11 \ No newline at end of file -- 2.30.9