From f0ee21722de3f3e0b57fde68334bbd01440c16ae Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Fri, 29 Feb 2008 16:50:40 +0000
Subject: [PATCH] Update module's permissions (remove View permission to
 Author).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19629 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../ModuleTemplateItem/project_module.xml     |  78 +++++------
 .../ModuleTemplateItem/requirement_module.xml |  78 +++++------
 .../ModuleTemplateItem/task_module.xml        |  78 +++++------
 .../ModuleTemplateItem/task_report_module.xml | 130 +++++++-----------
 bt5/erp5_project/bt/revision                  |   2 +-
 5 files changed, 146 insertions(+), 220 deletions(-)

diff --git a/bt5/erp5_project/ModuleTemplateItem/project_module.xml b/bt5/erp5_project/ModuleTemplateItem/project_module.xml
index 513f744da8..45b399eb61 100644
--- a/bt5/erp5_project/ModuleTemplateItem/project_module.xml
+++ b/bt5/erp5_project/ModuleTemplateItem/project_module.xml
@@ -40,6 +40,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>AccessContentsInformation</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -64,8 +68,9 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
@@ -171,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -227,23 +233,23 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Pluggable Index</name>
+   <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Plugin Registrys</name>
+   <name>Add PortalTransforms Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -278,10 +284,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -393,10 +396,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -435,6 +434,7 @@
   </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -453,11 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change user folder</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -489,8 +495,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit target</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>FTP access</name>
@@ -541,8 +548,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Selenium test cases</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
@@ -568,6 +576,10 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Manage extensions</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -679,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -711,33 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Zwiki: Add comments</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Add pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Add wikis</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Change page types</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Delete pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Edit pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Rate pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Rename pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Reparent pages</name>
-  </permission>
  </permission_list>
  <portal_type>Project Module</portal_type>
  <title>Projects</title>
diff --git a/bt5/erp5_project/ModuleTemplateItem/requirement_module.xml b/bt5/erp5_project/ModuleTemplateItem/requirement_module.xml
index 4b135b4986..628d021366 100644
--- a/bt5/erp5_project/ModuleTemplateItem/requirement_module.xml
+++ b/bt5/erp5_project/ModuleTemplateItem/requirement_module.xml
@@ -40,6 +40,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>AccessContentsInformation</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -64,8 +68,9 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
@@ -171,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -227,23 +233,23 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Pluggable Index</name>
+   <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Plugin Registrys</name>
+   <name>Add PortalTransforms Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -278,10 +284,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -393,10 +396,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -435,6 +434,7 @@
   </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -453,11 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change user folder</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -489,8 +495,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit target</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>FTP access</name>
@@ -541,8 +548,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Selenium test cases</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
@@ -568,6 +576,10 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Manage extensions</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -679,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -711,33 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Zwiki: Add comments</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Add pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Add wikis</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Change page types</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Delete pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Edit pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Rate pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Rename pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Reparent pages</name>
-  </permission>
  </permission_list>
  <portal_type>Requirement Module</portal_type>
  <title>Requirements</title>
diff --git a/bt5/erp5_project/ModuleTemplateItem/task_module.xml b/bt5/erp5_project/ModuleTemplateItem/task_module.xml
index 9352b02975..cf8e7407b1 100644
--- a/bt5/erp5_project/ModuleTemplateItem/task_module.xml
+++ b/bt5/erp5_project/ModuleTemplateItem/task_module.xml
@@ -40,6 +40,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>AccessContentsInformation</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -64,8 +68,9 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
@@ -171,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -227,23 +233,23 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Pluggable Index</name>
+   <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Plugin Registrys</name>
+   <name>Add PortalTransforms Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -278,10 +284,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -393,10 +396,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -435,6 +434,7 @@
   </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -453,11 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change user folder</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -489,8 +495,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit target</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>FTP access</name>
@@ -541,8 +548,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Selenium test cases</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
@@ -568,6 +576,10 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Manage extensions</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -679,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -711,33 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Zwiki: Add comments</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Add pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Add wikis</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Change page types</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Delete pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Edit pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Rate pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Rename pages</name>
-  </permission>
-  <permission type='list'>
-   <name>Zwiki: Reparent pages</name>
-  </permission>
  </permission_list>
  <portal_type>Task Module</portal_type>
  <title>Tasks</title>
diff --git a/bt5/erp5_project/ModuleTemplateItem/task_report_module.xml b/bt5/erp5_project/ModuleTemplateItem/task_report_module.xml
index 9000a5cce5..91a7c0e099 100644
--- a/bt5/erp5_project/ModuleTemplateItem/task_report_module.xml
+++ b/bt5/erp5_project/ModuleTemplateItem/task_report_module.xml
@@ -40,6 +40,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>AccessContentsInformation</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -64,6 +68,10 @@
    <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>
@@ -92,9 +100,6 @@
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMFCalendar Tools</name>
-  </permission>
   <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
@@ -103,30 +108,6 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add CMFWiki Comment</name>
-  </permission>
-  <permission type='list'>
-   <name>Add ChartObject</name>
-  </permission>
-  <permission type='list'>
-   <name>Add ChartTemplate</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Composite Elements</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Composite Slot Classs</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Composite Slots</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Composite Tools</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Composites</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
    <role>Manager</role>
@@ -195,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -251,15 +233,11 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -270,8 +248,9 @@
    <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -285,9 +264,6 @@
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add RenderableObject</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
@@ -324,22 +300,25 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
-   <name>Add ZGDCharts</name>
+  <permission type='tuple'>
+   <name>Add ZMailIn Clients</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add ZODB Mount Points</name>
+   <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Zope Schedulers</name>
+  <permission type='tuple'>
+   <name>Add ZODB Mount Points</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
@@ -373,12 +352,6 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Change CMFWiki Regulations</name>
-  </permission>
-  <permission type='list'>
-   <name>Change Composites</name>
-  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -423,10 +396,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -439,8 +408,13 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Change ZGDChart</name>
+  <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>
@@ -460,6 +434,7 @@
   </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -478,15 +453,19 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
    <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Create CMFWiki Page</name>
-  </permission>
   <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -508,9 +487,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Edit CMFWiki Page</name>
-  </permission>
   <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -519,8 +495,9 @@
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit target</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>FTP access</name>
@@ -571,8 +548,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Selenium test cases</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
@@ -598,8 +576,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage extensions</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
@@ -630,9 +609,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Move CMFWiki Page</name>
-  </permission>
   <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -641,6 +617,10 @@
    <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>
@@ -701,9 +681,6 @@
    <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>
@@ -714,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -726,6 +702,10 @@
    <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>
@@ -742,12 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZopeScheduler: Manage scheduling task</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeScheduler: Schedule tasks</name>
-  </permission>
  </permission_list>
  <portal_type>Task Report Module</portal_type>
  <title>Task Reports</title>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 25493604ef..43f9cb6413 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-395
\ No newline at end of file
+396
\ No newline at end of file
-- 
2.30.9