diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml index 5c39c42c6e3e7048cd3a045aa8fc564bd855fc0d..7d6996cb9cc91ab4fe5229d7497a904d6d982ee2 100644 --- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml +++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml @@ -1,14 +1,2 @@ <catalog_method> - <item key="_is_catalog_list_method_archive" type="int"> - <value>0</value> - </item> - <item key="_is_uncatalog_method_archive" type="int"> - <value>0</value> - </item> - <item key="_is_clear_method_archive" type="int"> - <value>0</value> - </item> - <item key="_is_filtered_archive" type="int"> - <value>0</value> - </item> </catalog_method> \ No newline at end of file diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml index f359328ee825fb292cd64640c35fb461e36e72d1..508929e16d983dbae0659d8c8b9807cc3d4d3343 100644 --- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml +++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml @@ -61,6 +61,12 @@ </object> </value> </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>allow_simple_one_argument_traversal</string> </key> <value> diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.catalog_keys.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.catalog_keys.xml deleted file mode 100644 index 5c39c42c6e3e7048cd3a045aa8fc564bd855fc0d..0000000000000000000000000000000000000000 --- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.catalog_keys.xml +++ /dev/null @@ -1,14 +0,0 @@ -<catalog_method> - <item key="_is_catalog_list_method_archive" type="int"> - <value>0</value> - </item> - <item key="_is_uncatalog_method_archive" type="int"> - <value>0</value> - </item> - <item key="_is_clear_method_archive" type="int"> - <value>0</value> - </item> - <item key="_is_filtered_archive" type="int"> - <value>0</value> - </item> -</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.xml deleted file mode 100644 index e83f809e825d6bf1d290043ce4790a46e029b8fb..0000000000000000000000000000000000000000 --- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ZSQLMethods.SQL</string> - <string>SQL</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_arg</string> </key> - <value> - <object> - <klass> - <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_data</string> </key> - <value> - <dictionary> - <item> - <key> <string>table_0</string> </key> - <value> - <dictionary/> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_keys</string> </key> - <value> - <list> -<string>table_0</string> - </list> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>allow_simple_one_argument_traversal</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>table_0</string> </value> - </item> - <item> - <key> <string>cache_time_</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>class_file_</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>class_name_</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>connection_hook</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>connection_id</string> </key> - <value> <string>erp5_sql_connection</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>z_related_translated_event_state</string> </value> - </item> - <item> - <key> <string>max_cache_</string> </key> - <value> <int>100</int> </value> - </item> - <item> - <key> <string>max_rows_</string> </key> - <value> <int>1000</int> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<dtml-var table_0>.original_message = catalog.event_state\n - AND <dtml-var table_0>.message_context = "event_state"\n - AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string"> - -]]></string> </value> - </item> - <item> - <key> <string>template</string> </key> - <value> - <object> - <klass> - <global name="SQL" module="Shared.DC.ZRDB.DA"/> - </klass> - <none/> - <state> - <dictionary> - <item> - <key> <string>__name__</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<string> - -]]></string> </value> - </item> - <item> - <key> <string>_vars</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>globals</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>raw</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<dtml-var table_0>.original_message = catalog.event_state\n - AND <dtml-var table_0>.message_context = "event_state"\n - AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string"> - -]]></string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml b/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml index 2bc2be94b0d5aac70ff4a0c97f0a2cc30f183e1e..e1f85638e1daa7f4a6ffc4ca5bf2721bb2b40e7f 100644 --- a/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml +++ b/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml @@ -1,4 +1,3 @@ <key_list> <key>source_organisation_title | category,catalog/title/z_related_source_organisation</key> - <key>translated_event_state_title | translation/translated_message/z_related_translated_event_state</key> </key_list> \ No newline at end of file diff --git a/bt5/erp5_crm/ModuleTemplateItem/event_module.xml b/bt5/erp5_crm/ModuleTemplateItem/event_module.xml index 2fc452dae71c494d64b552ccad496b6ec527d566..05c44cf64c0bc97afad6db35169bfc09f087a097 100644 --- a/bt5/erp5_crm/ModuleTemplateItem/event_module.xml +++ b/bt5/erp5_crm/ModuleTemplateItem/event_module.xml @@ -53,12 +53,11 @@ <role>Manager</role> </permission> <permission> - <name>Add Base18 Tools</name> + <name>Add Browser Id Manager</name> <role>Manager</role> </permission> <permission> - <name>Add Browser Id Manager</name> - <role>Manager</role> + <name>Add CMF Action Icons Tools</name> </permission> <permission> <name>Add CMF Active Processs</name> @@ -68,32 +67,36 @@ <name>Add CMF Caching Policy Managers</name> <role>Manager</role> </permission> + <permission> + <name>Add CMF Calendar Tools</name> + </permission> <permission> <name>Add CMF Core Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add CMF Default Tools</name> + </permission> <permission> <name>Add CMF Report Tools</name> <role>Manager</role> </permission> <permission> - <name>Add CMF Sites</name> - <role>Manager</role> + <name>Add CMF Setup Tools</name> </permission> <permission> - <name>Add CMFActivity Tools</name> + <name>Add CMF Sites</name> <role>Manager</role> </permission> <permission> - <name>Add CMFCalendar Tools</name> - <role>Manager</role> + <name>Add CMF Unique Id Tools</name> </permission> <permission> - <name>Add CMFCategory Tools</name> + <name>Add CMFActivity Tools</name> <role>Manager</role> </permission> <permission> - <name>Add CMFDefault Tools</name> + <name>Add CMFCategory Tools</name> <role>Manager</role> </permission> <permission> @@ -101,8 +104,7 @@ <role>Manager</role> </permission> <permission> - <name>Add CMFWiki Comment</name> - <role>Manager</role> + <name>Add Configured CMF Sites</name> </permission> <permission> <name>Add Content Type Registrys</name> @@ -164,8 +166,7 @@ <role>Manager</role> </permission> <permission> - <name>Add ERP5Shop Tools</name> - <role>Manager</role> + <name>Add ERP5Subversion Tools</name> </permission> <permission> <name>Add ERP5SyncML Tools</name> @@ -211,10 +212,6 @@ <name>Add Localizers</name> <role>Manager</role> </permission> - <permission> - <name>Add MMM Shop Toolss</name> - <role>Manager</role> - </permission> <permission> <name>Add MailHost objects</name> <role>Manager</role> @@ -239,6 +236,9 @@ <name>Add Pluggable Index</name> <role>Manager</role> </permission> + <permission> + <name>Add Plugin Registrys</name> + </permission> <permission> <name>Add Portal ZSyncer Tools</name> </permission> @@ -294,6 +294,9 @@ <name>Add Z MySQL Database Connections</name> <role>Manager</role> </permission> + <permission> + <name>Add Z MySQL Database Deferred Connections</name> + </permission> <permission> <name>Add ZCatalogs</name> <role>Manager</role> @@ -339,18 +342,10 @@ <name>Add portal topics</name> <role>Manager</role> </permission> - <permission> - <name>Add shop category</name> - <role>Manager</role> - </permission> <permission> <name>Change Browser Id Manager</name> <role>Manager</role> </permission> - <permission> - <name>Change CMFWiki Regulations</name> - <role>Manager</role> - </permission> <permission> <name>Change DTML Documents</name> <role>Manager</role> @@ -435,6 +430,9 @@ <name>Change configuration</name> <role>Manager</role> </permission> + <permission> + <name>Change local roles</name> + </permission> <permission> <name>Change permissions</name> <role>Manager</role> @@ -451,19 +449,11 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission> - <name>Checkout shopping cart</name> - <role>Manager</role> - </permission> <permission> <name>Copy or Move</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission> - <name>Create CMFWiki Page</name> - <role>Manager</role> - </permission> <permission> <name>Create Transient Objects</name> <role>Manager</role> @@ -485,14 +475,6 @@ <name>Download ExtFile/ExtImage</name> <role>Manager</role> </permission> - <permission> - <name>Download Product</name> - <role>Manager</role> - </permission> - <permission> - <name>Edit CMFWiki Page</name> - <role>Manager</role> - </permission> <permission> <name>Edit Factories</name> <role>Manager</role> @@ -546,6 +528,9 @@ <name>Manage Access Rules</name> <role>Manager</role> </permission> + <permission> + <name>Manage Groups</name> + </permission> <permission> <name>Manage Transient Object Container</name> <role>Manager</role> @@ -570,13 +555,6 @@ <name>Manage ZCatalogIndex Entries</name> <role>Manager</role> </permission> - <permission> - <name>Manage currencies</name> - <role>Manager</role> - </permission> - <permission> - <name>Manage extensions</name> - </permission> <permission> <name>Manage languages</name> <role>Manager</role> @@ -593,26 +571,10 @@ <name>Manage properties</name> <role>Manager</role> </permission> - <permission> - <name>Manage shop</name> - <role>Manager</role> - </permission> - <permission> - <name>Manage shop catalog</name> - <role>Manager</role> - </permission> - <permission> - <name>Manage shop category</name> - <role>Manager</role> - </permission> <permission> <name>Manage users</name> <role>Manager</role> </permission> - <permission> - <name>Manage_messages</name> - <role>Manager</role> - </permission> <permission> <name>Modify Cookie Crumblers</name> <role>Manager</role> @@ -622,10 +584,6 @@ <role>Assignor</role> <role>Manager</role> </permission> - <permission> - <name>Move CMFWiki Page</name> - <role>Manager</role> - </permission> <permission> <name>Open/Close Database Connection</name> <role>Manager</role> @@ -662,6 +620,9 @@ <name>Search ZCatalog</name> <role>Manager</role> </permission> + <permission> + <name>Search for principals</name> + </permission> <permission> <name>Set own password</name> <role>Manager</role> diff --git a/bt5/erp5_crm/ModuleTemplateItem/sale_opportunity_module.xml b/bt5/erp5_crm/ModuleTemplateItem/sale_opportunity_module.xml index bae1a48671eef6b2bcb5a275c39c24151a342b22..4eac7c3044c8785b9ed7dd032964cded2ebedac6 100644 --- a/bt5/erp5_crm/ModuleTemplateItem/sale_opportunity_module.xml +++ b/bt5/erp5_crm/ModuleTemplateItem/sale_opportunity_module.xml @@ -29,10 +29,10 @@ <name>Add BTreeFolder2s</name> </permission> <permission> - <name>Add Base18 Tools</name> + <name>Add Browser Id Manager</name> </permission> <permission> - <name>Add Browser Id Manager</name> + <name>Add CMF Action Icons Tools</name> </permission> <permission> <name>Add CMF Active Processs</name> @@ -40,32 +40,38 @@ <permission> <name>Add CMF Caching Policy Managers</name> </permission> + <permission> + <name>Add CMF Calendar Tools</name> + </permission> <permission> <name>Add CMF Core Tools</name> </permission> + <permission> + <name>Add CMF Default Tools</name> + </permission> <permission> <name>Add CMF Report Tools</name> </permission> <permission> - <name>Add CMF Sites</name> + <name>Add CMF Setup Tools</name> </permission> <permission> - <name>Add CMFActivity Tools</name> + <name>Add CMF Sites</name> </permission> <permission> - <name>Add CMFCalendar Tools</name> + <name>Add CMF Unique Id Tools</name> </permission> <permission> - <name>Add CMFCategory Tools</name> + <name>Add CMFActivity Tools</name> </permission> <permission> - <name>Add CMFDefault Tools</name> + <name>Add CMFCategory Tools</name> </permission> <permission> <name>Add CMFMailIn Tools</name> </permission> <permission> - <name>Add CMFWiki Comment</name> + <name>Add Configured CMF Sites</name> </permission> <permission> <name>Add Content Type Registrys</name> @@ -116,7 +122,7 @@ <name>Add ERP5Form Tools</name> </permission> <permission> - <name>Add ERP5Shop Tools</name> + <name>Add ERP5Subversion Tools</name> </permission> <permission> <name>Add ERP5SyncML Tools</name> @@ -151,9 +157,6 @@ <permission> <name>Add Localizers</name> </permission> - <permission> - <name>Add MMM Shop Toolss</name> - </permission> <permission> <name>Add MailHost objects</name> </permission> @@ -172,6 +175,9 @@ <permission> <name>Add Pluggable Index</name> </permission> + <permission> + <name>Add Plugin Registrys</name> + </permission> <permission> <name>Add Portal ZSyncer Tools</name> </permission> @@ -214,6 +220,9 @@ <permission> <name>Add Z MySQL Database Connections</name> </permission> + <permission> + <name>Add Z MySQL Database Deferred Connections</name> + </permission> <permission> <name>Add ZCatalogs</name> </permission> @@ -247,15 +256,9 @@ <permission> <name>Add portal topics</name> </permission> - <permission> - <name>Add shop category</name> - </permission> <permission> <name>Change Browser Id Manager</name> </permission> - <permission> - <name>Change CMFWiki Regulations</name> - </permission> <permission> <name>Change DTML Documents</name> </permission> @@ -319,6 +322,9 @@ <permission> <name>Change configuration</name> </permission> + <permission> + <name>Change local roles</name> + </permission> <permission> <name>Change permissions</name> </permission> @@ -331,15 +337,9 @@ <permission> <name>Change proxy roles</name> </permission> - <permission> - <name>Checkout shopping cart</name> - </permission> <permission> <name>Copy or Move</name> </permission> - <permission> - <name>Create CMFWiki Page</name> - </permission> <permission> <name>Create Transient Objects</name> </permission> @@ -355,12 +355,6 @@ <permission> <name>Download ExtFile/ExtImage</name> </permission> - <permission> - <name>Download Product</name> - </permission> - <permission> - <name>Edit CMFWiki Page</name> - </permission> <permission> <name>Edit Factories</name> </permission> @@ -397,6 +391,9 @@ <permission> <name>Manage Access Rules</name> </permission> + <permission> + <name>Manage Groups</name> + </permission> <permission> <name>Manage Transient Object Container</name> </permission> @@ -415,12 +412,6 @@ <permission> <name>Manage ZCatalogIndex Entries</name> </permission> - <permission> - <name>Manage currencies</name> - </permission> - <permission> - <name>Manage extensions</name> - </permission> <permission> <name>Manage languages</name> </permission> @@ -433,30 +424,15 @@ <permission> <name>Manage properties</name> </permission> - <permission> - <name>Manage shop</name> - </permission> - <permission> - <name>Manage shop catalog</name> - </permission> - <permission> - <name>Manage shop category</name> - </permission> <permission> <name>Manage users</name> </permission> - <permission> - <name>Manage_messages</name> - </permission> <permission> <name>Modify Cookie Crumblers</name> </permission> <permission> <name>Modify portal content</name> </permission> - <permission> - <name>Move CMFWiki Page</name> - </permission> <permission> <name>Open/Close Database Connection</name> </permission> @@ -484,6 +460,9 @@ <permission> <name>Search ZCatalog</name> </permission> + <permission> + <name>Search for principals</name> + </permission> <permission> <name>Set own password</name> </permission> diff --git a/bt5/erp5_crm/ModuleTemplateItem/support_request_module.xml b/bt5/erp5_crm/ModuleTemplateItem/support_request_module.xml index 1cf23557a959c0354dbf94e009d6558190a6e8f5..48b6d2393755037f8ca81c335ba92a3d8f3d8236 100644 --- a/bt5/erp5_crm/ModuleTemplateItem/support_request_module.xml +++ b/bt5/erp5_crm/ModuleTemplateItem/support_request_module.xml @@ -29,10 +29,10 @@ <name>Add BTreeFolder2s</name> </permission> <permission> - <name>Add Base18 Tools</name> + <name>Add Browser Id Manager</name> </permission> <permission> - <name>Add Browser Id Manager</name> + <name>Add CMF Action Icons Tools</name> </permission> <permission> <name>Add CMF Active Processs</name> @@ -40,32 +40,38 @@ <permission> <name>Add CMF Caching Policy Managers</name> </permission> + <permission> + <name>Add CMF Calendar Tools</name> + </permission> <permission> <name>Add CMF Core Tools</name> </permission> + <permission> + <name>Add CMF Default Tools</name> + </permission> <permission> <name>Add CMF Report Tools</name> </permission> <permission> - <name>Add CMF Sites</name> + <name>Add CMF Setup Tools</name> </permission> <permission> - <name>Add CMFActivity Tools</name> + <name>Add CMF Sites</name> </permission> <permission> - <name>Add CMFCalendar Tools</name> + <name>Add CMF Unique Id Tools</name> </permission> <permission> - <name>Add CMFCategory Tools</name> + <name>Add CMFActivity Tools</name> </permission> <permission> - <name>Add CMFDefault Tools</name> + <name>Add CMFCategory Tools</name> </permission> <permission> <name>Add CMFMailIn Tools</name> </permission> <permission> - <name>Add CMFWiki Comment</name> + <name>Add Configured CMF Sites</name> </permission> <permission> <name>Add Content Type Registrys</name> @@ -116,7 +122,7 @@ <name>Add ERP5Form Tools</name> </permission> <permission> - <name>Add ERP5Shop Tools</name> + <name>Add ERP5Subversion Tools</name> </permission> <permission> <name>Add ERP5SyncML Tools</name> @@ -151,9 +157,6 @@ <permission> <name>Add Localizers</name> </permission> - <permission> - <name>Add MMM Shop Toolss</name> - </permission> <permission> <name>Add MailHost objects</name> </permission> @@ -172,6 +175,9 @@ <permission> <name>Add Pluggable Index</name> </permission> + <permission> + <name>Add Plugin Registrys</name> + </permission> <permission> <name>Add Portal ZSyncer Tools</name> </permission> @@ -214,6 +220,9 @@ <permission> <name>Add Z MySQL Database Connections</name> </permission> + <permission> + <name>Add Z MySQL Database Deferred Connections</name> + </permission> <permission> <name>Add ZCatalogs</name> </permission> @@ -247,15 +256,9 @@ <permission> <name>Add portal topics</name> </permission> - <permission> - <name>Add shop category</name> - </permission> <permission> <name>Change Browser Id Manager</name> </permission> - <permission> - <name>Change CMFWiki Regulations</name> - </permission> <permission> <name>Change DTML Documents</name> </permission> @@ -319,6 +322,9 @@ <permission> <name>Change configuration</name> </permission> + <permission> + <name>Change local roles</name> + </permission> <permission> <name>Change permissions</name> </permission> @@ -331,15 +337,9 @@ <permission> <name>Change proxy roles</name> </permission> - <permission> - <name>Checkout shopping cart</name> - </permission> <permission> <name>Copy or Move</name> </permission> - <permission> - <name>Create CMFWiki Page</name> - </permission> <permission> <name>Create Transient Objects</name> </permission> @@ -355,12 +355,6 @@ <permission> <name>Download ExtFile/ExtImage</name> </permission> - <permission> - <name>Download Product</name> - </permission> - <permission> - <name>Edit CMFWiki Page</name> - </permission> <permission> <name>Edit Factories</name> </permission> @@ -397,6 +391,9 @@ <permission> <name>Manage Access Rules</name> </permission> + <permission> + <name>Manage Groups</name> + </permission> <permission> <name>Manage Transient Object Container</name> </permission> @@ -415,12 +412,6 @@ <permission> <name>Manage ZCatalogIndex Entries</name> </permission> - <permission> - <name>Manage currencies</name> - </permission> - <permission> - <name>Manage extensions</name> - </permission> <permission> <name>Manage languages</name> </permission> @@ -433,30 +424,15 @@ <permission> <name>Manage properties</name> </permission> - <permission> - <name>Manage shop</name> - </permission> - <permission> - <name>Manage shop catalog</name> - </permission> - <permission> - <name>Manage shop category</name> - </permission> <permission> <name>Manage users</name> </permission> - <permission> - <name>Manage_messages</name> - </permission> <permission> <name>Modify Cookie Crumblers</name> </permission> <permission> <name>Modify portal content</name> </permission> - <permission> - <name>Move CMFWiki Page</name> - </permission> <permission> <name>Open/Close Database Connection</name> </permission> @@ -484,6 +460,9 @@ <permission> <name>Search ZCatalog</name> </permission> + <permission> + <name>Search for principals</name> + </permission> <permission> <name>Set own password</name> </permission> diff --git a/bt5/erp5_crm/PortalTypeTemplateItem/workflow_chain_type.xml b/bt5/erp5_crm/PortalTypeTemplateItem/workflow_chain_type.xml deleted file mode 100644 index f6f97c5f37cf267c5203025baa113e97a43eedea..0000000000000000000000000000000000000000 --- a/bt5/erp5_crm/PortalTypeTemplateItem/workflow_chain_type.xml +++ /dev/null @@ -1,38 +0,0 @@ -<workflow_chain> - <chain> - <type>Event Module</type> - <workflow></workflow> - </chain> - <chain> - <type>Incoming Fax</type> - <workflow>event_workflow, edit_workflow</workflow> - </chain> - <chain> - <type>Incoming Letter</type> - <workflow>event_workflow, edit_workflow</workflow> - </chain> - <chain> - <type>Mail Message</type> - <workflow>event_workflow, edit_workflow</workflow> - </chain> - <chain> - <type>Phone Call</type> - <workflow>event_workflow, edit_workflow</workflow> - </chain> - <chain> - <type>Sale Opportunity</type> - <workflow>sale_opportunity_workflow, edit_workflow</workflow> - </chain> - <chain> - <type>Sale Opportunity Module</type> - <workflow></workflow> - </chain> - <chain> - <type>Support Request</type> - <workflow>validation_workflow, edit_workflow</workflow> - </chain> - <chain> - <type>Support Request Module</type> - <workflow></workflow> - </chain> -</workflow_chain> \ No newline at end of file diff --git a/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml new file mode 100644 index 0000000000000000000000000000000000000000..1e94d7ffc430a8c9082110edbf45feb7fd3eeb35 --- /dev/null +++ b/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -0,0 +1,26 @@ +<workflow_chain> + <chain> + <type>Incoming Fax</type> + <workflow>edit_workflow, event_workflow</workflow> + </chain> + <chain> + <type>Incoming Letter</type> + <workflow>edit_workflow, event_workflow</workflow> + </chain> + <chain> + <type>Mail Message</type> + <workflow>edit_workflow, event_workflow</workflow> + </chain> + <chain> + <type>Phone Call</type> + <workflow>event_workflow, edit_workflow</workflow> + </chain> + <chain> + <type>Sale Opportunity</type> + <workflow>edit_workflow, sale_opportunity_workflow</workflow> + </chain> + <chain> + <type>Support Request</type> + <workflow>validation_workflow, edit_workflow</workflow> + </chain> +</workflow_chain> \ No newline at end of file diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_createEventFromMail.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_createEventFromMail.xml index 9e39bce75046f61b84265725393a4d9c30b8391c..bc31e9f76d1f7d22baecc2874ecd772f870e3ac0 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_createEventFromMail.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_createEventFromMail.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml index 2338139bde9165c3a9156b72eba8f220236c68bf..5ef2f4f910204ecea7ae683eb0edfc8f0bd0e250 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml index b44196c8c60ded2c41069c2ce3be687d311a1574..6f4fc1161ce54cfd909feecaeea4a17fc5a8655c 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml index d31f76f148fde241820fdcb9acc39cd48e88ac9b..46c1b6c2f357006feed7ff8dd82ea6859a23a992 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml @@ -136,9 +136,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> @@ -285,23 +283,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: here.getEncodedBody(output_charset="utf-8")</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml index 6fa2867d3369808d25d777eb70e214c0df85db8c..89126f76b6d26434a433c660e2541a981a377ae6 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml index 1ee0fce0adeda6ee722d060919235c3fb3e3e7e5..a925ca29c6d44f1be543577e8e52738002f9f7b6 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml @@ -30,6 +30,12 @@ <none/> </value> </item> + <item> + <key> <string>groups</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>event_workflow</string> </value> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSaleOpportunity.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSaleOpportunity.xml index 8df53e08457aaaae1884cf5f9d89bed99662b8a5..f332c03aea489b9a52b2df6cc5a1513eed14c906 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSaleOpportunity.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSaleOpportunity.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSupportRequest.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSupportRequest.xml index 061926bab3e510e1c3ee55e5e15777c3cf2ca1c8..73bdd9ebb03f0fbb297b235701f946c5e108103e 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSupportRequest.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createSupportRequest.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</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 81f4f49c9042b3a55ec0c682d56cba77ecff76c5..6a9a9adc56dde22768acaf6526463cf739b352c3 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 @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/test_error_message.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/test_error_message.xml index f09a12c4cde7bf14c227f7359187f2afad21e3cd..87f90c96104b07c64797b38a0090fa7cee3a3797 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/test_error_message.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/test_error_message.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_action.xml index 4fb7150946e7a11c2800e35fbf603e6a33fcbdea..1125727fbd4332d0d2b48488258e04202a83dfef 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_action.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_action.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_assign.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_assign.xml index dd090f57aa58ed841e41dd92737caab0d39635a9..67b0c1455860632c2436eee572e7f0603fbf45a1 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_assign.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/validate_user_assign.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow.xml index 9cfd49dae69b4fcbda07327beb279f36a1a411aa..ce818e2815e2f194627aaa4a29f6bb2094b17c98 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow.xml @@ -24,6 +24,12 @@ <tuple/> </value> </item> + <item> + <key> <string>groups</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>sale_opportunity_workflow</string> </value> 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 e83d00fd499f8e70361ba67fa94c976c05ed20aa..c7df736f98641e6a5913da4c95e164a39b1bdfa2 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 @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>Python_magic</string> </key> - <value> <string encoding="base64">O/INCg==</string> </value> + <value> <string encoding="base64">bfINCg==</string> </value> </item> <item> <key> <string>Script_magic</string> </key> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/enquiries.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/enquiries.xml index 7afe7ad046e0e28799b740146eccda94f0e4b262..ae1737b8b9c2ebda457ece8e4add578714563194 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/enquiries.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/worklists/enquiries.xml @@ -30,7 +30,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewSearchResultList?opportunity_state=enquired&local_roles=local_roles=%(local_roles)s&reset=1 +Base_viewSearchResultList?opportunity_state=enquired&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log index d73158706dc6c2368b3f57baee8aeca0a538528b..8f95e7ccc2a8398bafa611ce05c9f8a2e4140312 100644 --- a/bt5/erp5_crm/bt/change_log +++ b/bt5/erp5_crm/bt/change_log @@ -1,3 +1,13 @@ +2006-05-17 Romain +* Remove catalog method z_related_translated_event_state +* Remove related key translated_event_state_title | translation/translated_message/z_related_translated_event_state + +2006-05-15 Alex +* Update maintainers. + +2006-03-27 kevin +* Don't encode MailMessage_view body, it's done automatticaly now. + 2006-03-03 kevin * Display an encoded UTF-8 body for Mail Message. diff --git a/bt5/erp5_crm/bt/maintainer_list b/bt5/erp5_crm/bt/maintainer_list new file mode 100644 index 0000000000000000000000000000000000000000..e7b75374b9f33f0f8417a830ce64d6a2859d5928 --- /dev/null +++ b/bt5/erp5_crm/bt/maintainer_list @@ -0,0 +1,2 @@ +romain +alex \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_catalog_method_id_list b/bt5/erp5_crm/bt/template_catalog_method_id_list index cc9a4f9b23c80c6a8865fe7f8369706871b40428..7dc6cddd44e3fca781a737d009615a786f00b62e 100644 --- a/bt5/erp5_crm/bt/template_catalog_method_id_list +++ b/bt5/erp5_crm/bt/template_catalog_method_id_list @@ -1,2 +1 @@ -erp5_mysql/z_related_source_organisation -erp5_mysql/z_related_translated_event_state \ No newline at end of file +erp5_mysql/z_related_source_organisation \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_catalog_related_key_list b/bt5/erp5_crm/bt/template_catalog_related_key_list index 2340fe69dac393cddf576db50c1188a62c759358..aa818ab11a98a495bce3053cc0af9e8994f0f6da 100644 --- a/bt5/erp5_crm/bt/template_catalog_related_key_list +++ b/bt5/erp5_crm/bt/template_catalog_related_key_list @@ -1,2 +1 @@ -translated_event_state_title | translation/translated_message/z_related_translated_event_state source_organisation_title | category,catalog/title/z_related_source_organisation \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_update_business_template_workflow b/bt5/erp5_crm/bt/template_update_business_template_workflow new file mode 100644 index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547 --- /dev/null +++ b/bt5/erp5_crm/bt/template_update_business_template_workflow @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/bt5/erp5_crm/bt/template_update_tool b/bt5/erp5_crm/bt/template_update_tool new file mode 100644 index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547 --- /dev/null +++ b/bt5/erp5_crm/bt/template_update_tool @@ -0,0 +1 @@ +0 \ No newline at end of file