From c456eac15a81bb980df24606d54a455c3c645225 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 8 Mar 2010 08:38:30 +0000
Subject: [PATCH] xml format changes only.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33489 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../z_related_default_email.catalog_keys.xml  |   2 +-
 ...elated_destination_person.catalog_keys.xml |   2 +-
 .../z_related_resource_use.catalog_keys.xml   |   2 +-
 ...lated_source_organisation.catalog_keys.xml |   2 +-
 .../z_related_source_person.catalog_keys.xml  |   2 +-
 .../ModuleTemplateItem/currency_module.xml    | 642 ------------------
 .../notification_message_module.xml           | 642 ------------------
 .../organisation_module.xml                   | 642 ------------------
 .../ModuleTemplateItem/person_module.xml      | 642 ------------------
 .../ModuleTemplateItem/query_module.xml       | 642 ------------------
 .../portal_caches/document_cache_factory.xml  |  28 +-
 bt5/erp5_base/bt/revision                     |   2 +-
 bt5/erp5_base/bt/template_base_category_list  |   2 +-
 13 files changed, 8 insertions(+), 3244 deletions(-)

diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.catalog_keys.xml
index 7d6996cb9c..a540f9431e 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.catalog_keys.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.catalog_keys.xml
@@ -1,2 +1,2 @@
 <catalog_method>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.catalog_keys.xml
index 7d6996cb9c..a540f9431e 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.catalog_keys.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.catalog_keys.xml
@@ -1,2 +1,2 @@
 <catalog_method>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml
index 7d6996cb9c..a540f9431e 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml
@@ -1,2 +1,2 @@
 <catalog_method>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.catalog_keys.xml
index 7d6996cb9c..a540f9431e 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.catalog_keys.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.catalog_keys.xml
@@ -1,2 +1,2 @@
 <catalog_method>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.catalog_keys.xml
index 7d6996cb9c..a540f9431e 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.catalog_keys.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.catalog_keys.xml
@@ -1,2 +1,2 @@
 <catalog_method>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
diff --git a/bt5/erp5_base/ModuleTemplateItem/currency_module.xml b/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
index 7b1b3b06da..d07966a904 100644
--- a/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
@@ -1,12 +1,6 @@
 <module>
  <id>currency_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,428 +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='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='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>
@@ -447,58 +36,11 @@
    <role>Author</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>
@@ -508,175 +50,11 @@
    <role>Author</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 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>
@@ -694,26 +72,6 @@
    <role>Author</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>Currency Module</portal_type>
  <title>Currencies</title>
diff --git a/bt5/erp5_base/ModuleTemplateItem/notification_message_module.xml b/bt5/erp5_base/ModuleTemplateItem/notification_message_module.xml
index bd4428f0cc..56d2cfa2fc 100644
--- a/bt5/erp5_base/ModuleTemplateItem/notification_message_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/notification_message_module.xml
@@ -1,12 +1,6 @@
 <module>
  <id>notification_message_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,428 +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='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='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>
@@ -447,58 +36,11 @@
    <role>Author</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>
@@ -508,175 +50,11 @@
    <role>Author</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 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>
@@ -694,26 +72,6 @@
    <role>Author</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>Notification Message Module</portal_type>
  <title>Notification Messages</title>
diff --git a/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml b/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
index ece4cff376..1ded15ff66 100644
--- a/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
@@ -1,12 +1,6 @@
 <module>
  <id>organisation_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,428 +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='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='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>
@@ -447,58 +36,11 @@
    <role>Author</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>
@@ -508,175 +50,11 @@
    <role>Author</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 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>
@@ -694,26 +72,6 @@
    <role>Author</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>Organisation Module</portal_type>
  <title>Organisations</title>
diff --git a/bt5/erp5_base/ModuleTemplateItem/person_module.xml b/bt5/erp5_base/ModuleTemplateItem/person_module.xml
index 6ebc4c4a73..9d237cc6d9 100644
--- a/bt5/erp5_base/ModuleTemplateItem/person_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/person_module.xml
@@ -1,12 +1,6 @@
 <module>
  <id>person_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,428 +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='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='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>
@@ -447,58 +36,11 @@
    <role>Author</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>
@@ -508,175 +50,11 @@
    <role>Author</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 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>
@@ -694,26 +72,6 @@
    <role>Author</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>Person Module</portal_type>
  <title>Persons</title>
diff --git a/bt5/erp5_base/ModuleTemplateItem/query_module.xml b/bt5/erp5_base/ModuleTemplateItem/query_module.xml
index 5ab885f6f9..67ed78f37f 100644
--- a/bt5/erp5_base/ModuleTemplateItem/query_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/query_module.xml
@@ -1,12 +1,6 @@
 <module>
  <id>query_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,428 +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='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='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>
@@ -447,58 +36,11 @@
    <role>Author</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>
@@ -508,175 +50,11 @@
    <role>Author</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 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>
@@ -694,26 +72,6 @@
    <role>Author</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>Query Module</portal_type>
  <title>Queries</title>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml b/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml
index de7c045f82..38027c8ba8 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml
@@ -61,16 +61,7 @@
       <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
-      <tuple>
-        <tuple>
-          <tuple>
-            <tuple>
-              <string>ERP5 Zodb Cache</string>
-              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-            </tuple>
-          </tuple>
-        </tuple>
-      </tuple>
+      <none/>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
@@ -81,21 +72,4 @@
       <none/>
     </pickle>
   </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <global name="OIBTree" module="BTrees._OIBTree"/>
-    </pickle>
-    <pickle>
-      <tuple>
-        <tuple>
-          <tuple>
-            <tuple>
-              <string>1</string>
-              <int>1</int>
-            </tuple>
-          </tuple>
-        </tuple>
-      </tuple>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 96fb20c16e..d15aedf3ca 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-691
\ No newline at end of file
+692
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_base_category_list b/bt5/erp5_base/bt/template_base_category_list
index c6b01cd0d4..49d39c73f7 100644
--- a/bt5/erp5_base/bt/template_base_category_list
+++ b/bt5/erp5_base/bt/template_base_category_list
@@ -17,7 +17,6 @@ grade
 group
 insurance_coverage
 legal_parent
-property_mapping
 marital_status
 market_segment
 nationality
@@ -26,6 +25,7 @@ order_builder
 payment_mode
 predecessor
 price_currency
+property_mapping
 region
 resource_use
 role
-- 
2.30.9