From d87e8af6e265b2be8a902ace6e4272fde2561e55 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 6 Nov 2009 09:21:45 +0000 Subject: [PATCH] XML format changes only. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30356 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ModuleTemplateItem/account_module.xml | 654 ------------------ .../ModuleTemplateItem/accounting_module.xml | 654 ------------------ .../default_category_tester.xml | 24 +- .../allowed_content_types.xml | 26 +- .../hidden_content_type_list.xml | 12 +- .../workflow_chain_type.xml | 18 +- bt5/erp5_accounting/bt/revision | 2 +- 7 files changed, 32 insertions(+), 1358 deletions(-) diff --git a/bt5/erp5_accounting/ModuleTemplateItem/account_module.xml b/bt5/erp5_accounting/ModuleTemplateItem/account_module.xml index 9ca2c640bd..c435c01da8 100644 --- a/bt5/erp5_accounting/ModuleTemplateItem/account_module.xml +++ b/bt5/erp5_accounting/ModuleTemplateItem/account_module.xml @@ -1,12 +1,6 @@ <module> <id>account_module</id> <permission_list> - <permission type='list'> - <name>Access Transient Objects</name> - </permission> - <permission type='list'> - <name>Access arbitrary user session data</name> - </permission> <permission type='tuple'> <name>Access contents information</name> <role>Assignee</role> @@ -16,437 +10,23 @@ <role>Author</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Access future portal content</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Access inactive portal content</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Access session data</name> - </permission> - <permission type='list'> - <name>Add Accelerated HTTP Cache Managers</name> - </permission> - <permission type='tuple'> - <name>Add BTreeFolder2s</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Browser Id Manager</name> - </permission> - <permission type='list'> - <name>Add CMF Action Icons Tools</name> - </permission> - <permission type='tuple'> - <name>Add CMF Active Processs</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Caching Policy Managers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Calendar Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Core Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Default Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Report Tools</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add CMF Setup Tools</name> - </permission> - <permission type='tuple'> - <name>Add CMF Sites</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add CMF Unique Id Tools</name> - </permission> - <permission type='tuple'> - <name>Add CMFActivity Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMFCategory Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMFMailIn Tools</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Configured CMF Sites</name> - </permission> - <permission type='tuple'> - <name>Add Content Type Registrys</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Cookie Crumblers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Database Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Documents, Images, and Files</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Filesystem Formulator Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 OOo Templates</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 PDF Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 PDF Templates</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Publications</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Reports</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Sites</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Subscriptions</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Catalog Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Form Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Subversion Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5SyncML Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Type Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ExtFiles</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ExtImages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add External Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Filesystem Directory Views</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Folders</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Formulator Forms</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add HBTreeFolder2s</name> - </permission> - <permission type='list'> - <name>Add LDAP Connections</name> - </permission> - <permission type='list'> - <name>Add LDAP Methods</name> - </permission> - <permission type='list'> - <name>Add LDIF Methods</name> - </permission> - <permission type='tuple'> - <name>Add LocalContents</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add LocalFolders</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Localizers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add MailHost objects</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add MessageCatalogs</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add MimetypesRegistry Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Page Templates</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Photo Folders</name> - </permission> - <permission type='list'> - <name>Add Photos</name> - </permission> - <permission type='tuple'> - <name>Add Pluggable Index</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Plugin Registrys</name> - </permission> - <permission type='tuple'> - <name>Add PortalTransforms Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Python Scripts</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add RAM Cache Managers</name> - </permission> - <permission type='list'> - <name>Add ReStructuredText Documents</name> - </permission> - <permission type='list'> - <name>Add Session Data Manager</name> - </permission> - <permission type='list'> - <name>Add Site Roots</name> - </permission> - <permission type='list'> - <name>Add Temporary Folder</name> - </permission> - <permission type='list'> - <name>Add Transient Object Container</name> - </permission> - <permission type='tuple'> - <name>Add User Folders</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Virtual Host Monsters</name> - </permission> - <permission type='tuple'> - <name>Add Vocabularies</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Z Gadfly Database Connections</name> - </permission> - <permission type='tuple'> - <name>Add Z MySQL Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Z MySQL Deferred Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ZCatalogs</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ZMailIn Clients</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ZMailMessages</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add ZODB Mount Points</name> - </permission> - <permission type='list'> - <name>Add Zope Tutorials</name> - </permission> <permission type='tuple'> <name>Add portal content</name> <role>Assignor</role> <role>Author</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Add portal events</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>Add portal folders</name> <role>Assignor</role> <role>Author</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Add portal member</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add portal topics</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Browse Connection Entries</name> - </permission> - <permission type='list'> - <name>Change Browser Id Manager</name> - </permission> - <permission type='tuple'> - <name>Change DTML Documents</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change DTML Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Database Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change ExtFile/ExtImage</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change External Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Formulator Fields</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Formulator Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Images and Files</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change LDAP Methods</name> - </permission> - <permission type='tuple'> - <name>Change Lock Information</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Page Templates</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change Photo</name> - </permission> - <permission type='tuple'> - <name>Change Python Scripts</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change Session Data Manager</name> - </permission> - <permission type='tuple'> - <name>Change Versions</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change ZMailIn</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change ZMailMessages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change bindings</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change cache managers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change cache settings</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change configuration</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>Change local roles</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change permissions</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change portal events</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change portal topics</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change proxy roles</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</name> <role>Assignee</role> @@ -455,58 +35,11 @@ <role>Auditor</role> <role>Manager</role> </permission> - <permission type='list'> - <name>Create New Entry Objects</name> - </permission> - <permission type='list'> - <name>Create Transient Objects</name> - </permission> - <permission type='tuple'> - <name>Create class instances</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Define permissions</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Delete Entry Objects</name> - </permission> <permission type='tuple'> <name>Delete objects</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Download ExtFile/ExtImage</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Edit Factories</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Edit ReStructuredText</name> - </permission> - <permission type='list'> - <name>Edit connection</name> - </permission> - <permission type='tuple'> - <name>Edit target</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>FTP access</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Import/Export objects</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Join/leave Versions</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>List folder contents</name> <role>Assignee</role> @@ -515,178 +48,11 @@ <role>Auditor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>List portal members</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>List undoable changes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Log Site Errors</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Log to the Event Log</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Mail forgotten password</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage Access Rules</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Manage Entry information</name> - </permission> - <permission type='tuple'> - <name>Manage Groups</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage Selenium test cases</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Manage Transient Object Container</name> - </permission> - <permission type='tuple'> - <name>Manage Vocabulary</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage WebDAV Locks</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage Z Classes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage ZCatalog Entries</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage ZCatalogIndex Entries</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage languages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage messages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage portal</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage properties</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage users</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Modify Cookie Crumblers</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>Modify portal content</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission type='list'> - <name>Open/Close Connection</name> - </permission> - <permission type='tuple'> - <name>Open/Close Database Connection</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Open/Close Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Post mail to ZMailIn</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Query Vocabulary</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Reply to item</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Request review</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Review portal content</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Save/discard Version changes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Search ZCatalog</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Search for principals</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Set own password</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Set own properties</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Take ownership</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Test Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Translate Content</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Undo changes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Use Database Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Use Factories</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Use LDAP Methods</name> - </permission> - <permission type='list'> - <name>Use external editor</name> - </permission> - <permission type='tuple'> - <name>Use mailhost services</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>View</name> <role>Assignee</role> @@ -703,26 +69,6 @@ <role>Auditor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>View ZMailMessage</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>View management screens</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>WebDAV Lock items</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>WebDAV Unlock items</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>WebDAV access</name> - <role>Manager</role> - </permission> </permission_list> <portal_type>Account Module</portal_type> <title>Accounts</title> diff --git a/bt5/erp5_accounting/ModuleTemplateItem/accounting_module.xml b/bt5/erp5_accounting/ModuleTemplateItem/accounting_module.xml index dcdd8cd293..64f4785505 100644 --- a/bt5/erp5_accounting/ModuleTemplateItem/accounting_module.xml +++ b/bt5/erp5_accounting/ModuleTemplateItem/accounting_module.xml @@ -1,12 +1,6 @@ <module> <id>accounting_module</id> <permission_list> - <permission type='list'> - <name>Access Transient Objects</name> - </permission> - <permission type='list'> - <name>Access arbitrary user session data</name> - </permission> <permission type='tuple'> <name>Access contents information</name> <role>Assignee</role> @@ -16,437 +10,23 @@ <role>Author</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Access future portal content</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Access inactive portal content</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Access session data</name> - </permission> - <permission type='list'> - <name>Add Accelerated HTTP Cache Managers</name> - </permission> - <permission type='tuple'> - <name>Add BTreeFolder2s</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Browser Id Manager</name> - </permission> - <permission type='list'> - <name>Add CMF Action Icons Tools</name> - </permission> - <permission type='tuple'> - <name>Add CMF Active Processs</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Caching Policy Managers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Calendar Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Core Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Default Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMF Report Tools</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add CMF Setup Tools</name> - </permission> - <permission type='tuple'> - <name>Add CMF Sites</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add CMF Unique Id Tools</name> - </permission> - <permission type='tuple'> - <name>Add CMFActivity Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMFCategory Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add CMFMailIn Tools</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Configured CMF Sites</name> - </permission> - <permission type='tuple'> - <name>Add Content Type Registrys</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Cookie Crumblers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Database Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Documents, Images, and Files</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Filesystem Formulator Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 OOo Templates</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 PDF Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 PDF Templates</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Publications</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Reports</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Sites</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Subscriptions</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5 Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Catalog Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Form Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Subversion Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5SyncML Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ERP5Type Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ExtFiles</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ExtImages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add External Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Filesystem Directory Views</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Folders</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Formulator Forms</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add HBTreeFolder2s</name> - </permission> - <permission type='list'> - <name>Add LDAP Connections</name> - </permission> - <permission type='list'> - <name>Add LDAP Methods</name> - </permission> - <permission type='list'> - <name>Add LDIF Methods</name> - </permission> - <permission type='tuple'> - <name>Add LocalContents</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add LocalFolders</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Localizers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add MailHost objects</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add MessageCatalogs</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add MimetypesRegistry Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Page Templates</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Photo Folders</name> - </permission> - <permission type='list'> - <name>Add Photos</name> - </permission> - <permission type='tuple'> - <name>Add Pluggable Index</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Plugin Registrys</name> - </permission> - <permission type='tuple'> - <name>Add PortalTransforms Tools</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Python Scripts</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add RAM Cache Managers</name> - </permission> - <permission type='list'> - <name>Add ReStructuredText Documents</name> - </permission> - <permission type='list'> - <name>Add Session Data Manager</name> - </permission> - <permission type='list'> - <name>Add Site Roots</name> - </permission> - <permission type='list'> - <name>Add Temporary Folder</name> - </permission> - <permission type='list'> - <name>Add Transient Object Container</name> - </permission> - <permission type='tuple'> - <name>Add User Folders</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Virtual Host Monsters</name> - </permission> - <permission type='tuple'> - <name>Add Vocabularies</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add Z Gadfly Database Connections</name> - </permission> - <permission type='tuple'> - <name>Add Z MySQL Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add Z MySQL Deferred Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ZCatalogs</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ZMailIn Clients</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add ZMailMessages</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Add ZODB Mount Points</name> - </permission> - <permission type='list'> - <name>Add Zope Tutorials</name> - </permission> <permission type='tuple'> <name>Add portal content</name> <role>Assignor</role> <role>Author</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Add portal events</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>Add portal folders</name> <role>Assignor</role> <role>Author</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Add portal member</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Add portal topics</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Browse Connection Entries</name> - </permission> - <permission type='list'> - <name>Change Browser Id Manager</name> - </permission> - <permission type='tuple'> - <name>Change DTML Documents</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change DTML Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Database Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change ExtFile/ExtImage</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change External Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Formulator Fields</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Formulator Forms</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Images and Files</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change LDAP Methods</name> - </permission> - <permission type='tuple'> - <name>Change Lock Information</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change Page Templates</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change Photo</name> - </permission> - <permission type='tuple'> - <name>Change Python Scripts</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change Session Data Manager</name> - </permission> - <permission type='tuple'> - <name>Change Versions</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change ZMailIn</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change ZMailMessages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change bindings</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change cache managers</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change cache settings</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change configuration</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>Change local roles</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change permissions</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change portal events</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change portal topics</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Change proxy roles</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</name> <role>Assignee</role> @@ -455,58 +35,11 @@ <role>Auditor</role> <role>Manager</role> </permission> - <permission type='list'> - <name>Create New Entry Objects</name> - </permission> - <permission type='list'> - <name>Create Transient Objects</name> - </permission> - <permission type='tuple'> - <name>Create class instances</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Define permissions</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Delete Entry Objects</name> - </permission> <permission type='tuple'> <name>Delete objects</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Download ExtFile/ExtImage</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Edit Factories</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Edit ReStructuredText</name> - </permission> - <permission type='list'> - <name>Edit connection</name> - </permission> - <permission type='tuple'> - <name>Edit target</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>FTP access</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Import/Export objects</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Join/leave Versions</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>List folder contents</name> <role>Assignee</role> @@ -515,178 +48,11 @@ <role>Auditor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>List portal members</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>List undoable changes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Log Site Errors</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Log to the Event Log</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Mail forgotten password</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage Access Rules</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Manage Entry information</name> - </permission> - <permission type='tuple'> - <name>Manage Groups</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage Selenium test cases</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Manage Transient Object Container</name> - </permission> - <permission type='tuple'> - <name>Manage Vocabulary</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage WebDAV Locks</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage Z Classes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage ZCatalog Entries</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage ZCatalogIndex Entries</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage languages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage messages</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage portal</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage properties</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Manage users</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Modify Cookie Crumblers</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>Modify portal content</name> <role>Assignor</role> <role>Manager</role> </permission> - <permission type='list'> - <name>Open/Close Connection</name> - </permission> - <permission type='tuple'> - <name>Open/Close Database Connection</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Open/Close Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Post mail to ZMailIn</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Query Vocabulary</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Reply to item</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Request review</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Review portal content</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Save/discard Version changes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Search ZCatalog</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Search for principals</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Set own password</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Set own properties</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Take ownership</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Test Database Connections</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Translate Content</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Undo changes</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Use Database Methods</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>Use Factories</name> - <role>Manager</role> - </permission> - <permission type='list'> - <name>Use LDAP Methods</name> - </permission> - <permission type='list'> - <name>Use external editor</name> - </permission> - <permission type='tuple'> - <name>Use mailhost services</name> - <role>Manager</role> - </permission> <permission type='tuple'> <name>View</name> <role>Assignee</role> @@ -703,26 +69,6 @@ <role>Auditor</role> <role>Manager</role> </permission> - <permission type='tuple'> - <name>View ZMailMessage</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>View management screens</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>WebDAV Lock items</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>WebDAV Unlock items</name> - <role>Manager</role> - </permission> - <permission type='tuple'> - <name>WebDAV access</name> - <role>Manager</role> - </permission> </permission_list> <portal_type>Accounting Transaction Module</portal_type> <title>Accounting</title> diff --git a/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml b/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml index 5c3b5ad4c0..76b53f262c 100644 --- a/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml +++ b/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoice_rule/default_category_tester.xml @@ -85,25 +85,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -111,13 +99,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index c2aa282ec0..a533cfc422 100644 --- a/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -10,23 +10,23 @@ <item>Accounting Transaction Line</item> </portal_type> <portal_type id="Accounting Transaction"> - <item>Image</item> - <item>File</item> <item>Accounting Transaction Line</item> + <item>File</item> + <item>Image</item> </portal_type> <portal_type id="Accounting Transaction Module"> - <item>Purchase Invoice Transaction</item> <item>Accounting Transaction</item> - <item>Sale Invoice Transaction</item> - <item>Payment Transaction</item> <item>Balance Transaction</item> + <item>Payment Transaction</item> + <item>Purchase Invoice Transaction</item> + <item>Sale Invoice Transaction</item> </portal_type> <portal_type id="Balance Transaction"> <item>Balance Transaction Line</item> </portal_type> <portal_type id="Invoice Rule"> - <item>Property Divergence Tester</item> <item>Category Divergence Tester</item> + <item>Property Divergence Tester</item> <item>Quantity Divergence Tester</item> </portal_type> <portal_type id="Organisation"> @@ -34,33 +34,33 @@ <item>Cash Register</item> </portal_type> <portal_type id="Payment Rule"> - <item>Quantity Divergence Tester</item> - <item>Property Divergence Tester</item> <item>Category Divergence Tester</item> + <item>Property Divergence Tester</item> + <item>Quantity Divergence Tester</item> </portal_type> <portal_type id="Payment Transaction"> <item>Accounting Transaction Line</item> - <item>Image</item> <item>File</item> + <item>Image</item> </portal_type> <portal_type id="Preference"> <item>Accounting Transaction</item> - <item>Sale Invoice Transaction</item> - <item>Purchase Invoice Transaction</item> <item>Payment Transaction</item> + <item>Purchase Invoice Transaction</item> + <item>Sale Invoice Transaction</item> </portal_type> <portal_type id="Purchase Invoice Transaction"> - <item>Purchase Invoice Transaction Line</item> <item>File</item> <item>Image</item> + <item>Purchase Invoice Transaction Line</item> </portal_type> <portal_type id="Rule Tool"> <item>Invoice Rule</item> <item>Payment Rule</item> </portal_type> <portal_type id="Sale Invoice Transaction"> - <item>Sale Invoice Transaction Line</item> <item>File</item> <item>Image</item> + <item>Sale Invoice Transaction Line</item> </portal_type> </allowed_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_accounting/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_accounting/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml index c1abc91f98..4239f74ca5 100644 --- a/bt5/erp5_accounting/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml +++ b/bt5/erp5_accounting/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml @@ -3,8 +3,8 @@ <item>Accounting Transaction Line</item> </portal_type> <portal_type id="Accounting Transaction"> - <item>File</item> <item>Accounting Transaction Line</item> + <item>File</item> <item>Image</item> </portal_type> <portal_type id="Accounting Transaction Module"> @@ -14,15 +14,15 @@ <item>Balance Transaction Line</item> </portal_type> <portal_type id="Payment Transaction"> - <item>Image</item> - <item>File</item> <item>Accounting Transaction Line</item> + <item>File</item> + <item>Image</item> </portal_type> <portal_type id="Preference"> - <item>Payment Transaction</item> <item>Accounting Transaction</item> - <item>Sale Invoice Transaction</item> + <item>Payment Transaction</item> <item>Purchase Invoice Transaction</item> + <item>Sale Invoice Transaction</item> </portal_type> <portal_type id="Purchase Invoice Transaction"> <item>File</item> @@ -30,8 +30,8 @@ <item>Purchase Invoice Transaction Line</item> </portal_type> <portal_type id="Sale Invoice Transaction"> - <item>Sale Invoice Transaction Line</item> <item>File</item> <item>Image</item> + <item>Sale Invoice Transaction Line</item> </portal_type> </hidden_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 72f8b992f6..e69492361f 100644 --- a/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,11 +1,11 @@ <workflow_chain> <chain> <type>Account</type> - <workflow>edit_workflow, account_workflow</workflow> + <workflow>account_workflow, edit_workflow</workflow> </chain> <chain> <type>Accounting Period</type> - <workflow>edit_workflow, accounting_period_workflow</workflow> + <workflow>accounting_period_workflow, edit_workflow</workflow> </chain> <chain> <type>Accounting Transaction</type> @@ -17,11 +17,11 @@ </chain> <chain> <type>Balance Transaction</type> - <workflow>edit_workflow, accounting_workflow</workflow> + <workflow>accounting_workflow, edit_workflow</workflow> </chain> <chain> <type>Cash Register</type> - <workflow>validation_workflow, edit_workflow</workflow> + <workflow>edit_workflow, validation_workflow</workflow> </chain> <chain> <type>Invoice Rule</type> @@ -33,22 +33,22 @@ </chain> <chain> <type>Payment Transaction</type> - <workflow>edit_workflow, accounting_workflow</workflow> + <workflow>accounting_workflow, edit_workflow</workflow> </chain> <chain> <type>Purchase Invoice Transaction</type> - <workflow>delivery_causality_interaction_workflow, delivery_causality_workflow, accounting_workflow, delivery_simulation_interaction_workflow, edit_workflow</workflow> + <workflow>accounting_workflow, delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow</workflow> </chain> <chain> <type>Purchase Invoice Transaction Line</type> - <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow> + <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow> </chain> <chain> <type>Sale Invoice Transaction</type> - <workflow>delivery_causality_interaction_workflow, accounting_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow</workflow> + <workflow>accounting_workflow, delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow</workflow> </chain> <chain> <type>Sale Invoice Transaction Line</type> - <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow> + <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow> </chain> </workflow_chain> \ No newline at end of file diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 6ea72f0416..86509c9f05 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1032 \ No newline at end of file +1033 \ No newline at end of file -- 2.30.9