diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log index cc3c82527d7c1a2f66f765c7d60881f91da7126d..2f2f0b5f1600a73cf830347cbf1b99fd0881f01d 100644 --- a/bt5/erp5_crm/bt/change_log +++ b/bt5/erp5_crm/bt/change_log @@ -1,3 +1,6 @@ +2007-08-22 JPS +* Slight refactoring + 2007-08-13 Jerome * Remove portal type actions that are now defined as global actions diff --git a/bt5/erp5_crm/bt/copyright_list b/bt5/erp5_crm/bt/copyright_list index e8d752e9776b23585d513bc13f26b8e937c4ecc2..a58e6ac2bc79824d92f1eaf631ac316155180338 100644 --- a/bt5/erp5_crm/bt/copyright_list +++ b/bt5/erp5_crm/bt/copyright_list @@ -1 +1,2 @@ -Copyright (c) 2005-2006 Nexedi SARL \ No newline at end of file +Copyright (c) 2005-2006 Nexedi SARL +Copyright (c) 2007-2007 Nexedi SA \ No newline at end of file diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index 8783e305111947a209a0689074d8dfa60d33582e..9cd72aa941214d4cb8522dda34eb12cf878e3e8b 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -53 \ No newline at end of file +72 \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_action_path_list b/bt5/erp5_crm/bt/template_action_path_list index 7f8872f53f2afb99b26cab91ac50f8c61e6839f2..eec9e62094ab9fea01cf19b6a1b6fcf181ce96b7 100644 --- a/bt5/erp5_crm/bt/template_action_path_list +++ b/bt5/erp5_crm/bt/template_action_path_list @@ -1,13 +1,26 @@ +Campaign Module | view +Campaign | new_event +Campaign | view Event Module | view Event Module | workflow_report -Incoming Fax | document_view -Incoming Fax | view -Incoming Letter | document_view -Incoming Letter | view +Fax Message | assessment +Fax Message | preview +Fax Message | view +Letter | assessment +Letter | preview +Letter | view +Mail Message | assessment +Mail Message | preview Mail Message | view -Note | document_view +Meeting Module | view +Meeting | view +Note | assessment +Note | preview Note | view +Phone Call | assessment +Phone Call | preview Phone Call | view +Preference | crm_preference Sale Opportunity Module | view Sale Opportunity | view Support Request Module | view diff --git a/bt5/erp5_crm/bt/template_base_category_list b/bt5/erp5_crm/bt/template_base_category_list index 0cbbeba00dadc2451270d209e3c028901fd0d3d6..0fd4307723c6091b23d822eb12905e154efe64a8 100644 --- a/bt5/erp5_crm/bt/template_base_category_list +++ b/bt5/erp5_crm/bt/template_base_category_list @@ -1,2 +1 @@ -client follow_up \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_module_id_list b/bt5/erp5_crm/bt/template_module_id_list index 31503a6d72529431e12e922519e8827f3293f216..7c00d90a45ec5e5169d6df180322406701b9cd3a 100644 --- a/bt5/erp5_crm/bt/template_module_id_list +++ b/bt5/erp5_crm/bt/template_module_id_list @@ -1,3 +1,5 @@ +campaign_module event_module +meeting_module sale_opportunity_module support_request_module \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_path_list b/bt5/erp5_crm/bt/template_path_list index 8510d4fb4a9af2ba9df092360862be8e67412f8d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/bt5/erp5_crm/bt/template_path_list +++ b/bt5/erp5_crm/bt/template_path_list @@ -1,9 +0,0 @@ -portal_categories/resource/complaint_ticket -portal_categories/resource/incoming_fax -portal_categories/resource/incoming_letter -portal_categories/resource/mail_message -portal_categories/resource/meeting -portal_categories/resource/note -portal_categories/resource/phone_call -portal_categories/resource/sale_opportunity -portal_categories/resource/support_request \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list index 8d9e3fccb9be33072130a7f82e34249e4cc20ca2..32b73cda4190ec556e1dd9f9e54379e273fcb0a6 100644 --- a/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list @@ -1,25 +1,12 @@ -Event Module | Incoming Fax -Event Module | Incoming Letter +Campaign Module | Campaign +Event Module | Fax Message +Event Module | Letter Event Module | Mail Message Event Module | Note Event Module | Phone Call -Incoming Fax | File -Incoming Fax | Image -Incoming Letter | File -Incoming Letter | Image -Mail Message | Document -Mail Message | File -Mail Message | Image -Mail Message | Link -Note | File -Note | Image +Meeting Module | Meeting +Meeting | Role Definition Sale Opportunity Module | Sale Opportunity -Sale Opportunity | Document -Sale Opportunity | File -Sale Opportunity | Image -Sale Opportunity | Link +Sale Opportunity | Role Definition Support Request Module | Support Request -Support Request | Document -Support Request | File -Support Request | Image -Support Request | Link \ No newline at end of file +Support Request | Role Definition \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_portal_type_id_list b/bt5/erp5_crm/bt/template_portal_type_id_list index 96b3aa98dc0f37d62ba34d1033f6f82ecd3c223f..c68011ab64b1d27a873e4776383d93e62770104c 100644 --- a/bt5/erp5_crm/bt/template_portal_type_id_list +++ b/bt5/erp5_crm/bt/template_portal_type_id_list @@ -1,7 +1,11 @@ +Campaign +Campaign Module Event Module -Incoming Fax -Incoming Letter +Fax Message +Letter Mail Message +Meeting +Meeting Module Note Phone Call Sale Opportunity diff --git a/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list b/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list index a6b41d67eb70f39fedb625ac67b51df3cdc3f48b..77f09eb365d5212cd072d31b15b1cc4ab7a0e964 100644 --- a/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list @@ -1,9 +1,13 @@ -Incoming Fax | edit_workflow -Incoming Fax | event_workflow -Incoming Letter | edit_workflow -Incoming Letter | event_workflow +Campaign | edit_workflow +Campaign | ticket_workflow +Fax Message | edit_workflow +Fax Message | event_workflow +Letter | edit_workflow +Letter | event_workflow Mail Message | edit_workflow Mail Message | event_workflow +Meeting | edit_workflow +Meeting | ticket_workflow Note | edit_workflow Note | event_workflow Phone Call | edit_workflow diff --git a/bt5/erp5_crm/bt/version b/bt5/erp5_crm/bt/version index 7a634f9e3ec0102cf2dd171b77de653c1972f10d..331b40b0bde194d1ce0be21a59dfba59c553328f 100644 --- a/bt5/erp5_crm/bt/version +++ b/bt5/erp5_crm/bt/version @@ -1 +1 @@ -1.0rc6 \ No newline at end of file +1.1rc1 \ No newline at end of file