From de5245635b5bc65776e57140781bfa8fc7083369 Mon Sep 17 00:00:00 2001
From: Alexandre Boeglin <alex@nexedi.com>
Date: Fri, 8 Feb 2008 13:03:35 +0000
Subject: [PATCH] fix some modules permissions (using Base_setDefaultSecurity
script)
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19179 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../internal_packing_list_module.xml | 36 ----
.../ModuleTemplateItem/inventory_module.xml | 36 ----
.../purchase_order_module.xml | 158 ++++++++----------
.../purchase_packing_list_module.xml | 91 +++-------
.../purchase_supply_module.xml | 36 ----
.../purchase_trade_condition_module.xml | 158 ++++++++----------
.../returned_sale_packing_list_module.xml | 36 ----
.../ModuleTemplateItem/sale_order_module.xml | 91 +++-------
.../sale_packing_list_module.xml | 91 +++-------
.../ModuleTemplateItem/sale_supply_module.xml | 36 ----
.../sale_trade_condition_module.xml | 91 +++-------
bt5/erp5_trade/bt/revision | 2 +-
12 files changed, 221 insertions(+), 641 deletions(-)
diff --git a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
index 71231ca705..1e9d92d523 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
@@ -116,14 +116,6 @@
<name>Add Cookie Crumblers</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Database Connections</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Database Methods</name>
<role>Manager</role>
@@ -244,14 +236,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
@@ -416,10 +392,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>
@@ -514,10 +486,6 @@
<name>Edit target</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Execute DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>FTP access</name>
<role>Manager</role>
@@ -700,10 +668,6 @@
<name>Use Factories</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Use external editor</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Use mailhost services</name>
<role>Manager</role>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
index 24bde1edce..a5768404a9 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
@@ -116,14 +116,6 @@
<name>Add Cookie Crumblers</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Database Connections</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Database Methods</name>
<role>Manager</role>
@@ -244,14 +236,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
@@ -416,10 +392,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>
@@ -514,10 +486,6 @@
<name>Edit target</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Execute DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>FTP access</name>
<role>Manager</role>
@@ -700,10 +668,6 @@
<name>Use Factories</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Use external editor</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Use mailhost services</name>
<role>Manager</role>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
index 4c9591f1eb..1734fdfa41 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
@@ -52,8 +52,9 @@
<name>Add Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Action Icons Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMF Active Processs</name>
@@ -63,34 +64,38 @@
<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='list'>
+ <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'>
+ <permission type='tuple'>
<name>Add CMF Setup Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMF Sites</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Unique Id Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<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>
@@ -99,32 +104,9 @@
<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='list'>
+ <permission type='tuple'>
<name>Add Configured CMF Sites</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Content Type Registrys</name>
@@ -150,10 +132,11 @@
<name>Add ERP5 Forms</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add ERP5 OOo Templates</name>
+ <role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add ERP5 PDF Forms</name>
<role>Manager</role>
</permission>
@@ -189,8 +172,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>
@@ -245,26 +229,24 @@
<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'>
<name>Add Pluggable Index</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<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>
@@ -278,9 +260,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>
@@ -317,22 +296,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>
@@ -350,6 +332,8 @@
</permission>
<permission type='tuple'>
<name>Add portal folders</name>
+ <role>Assignor</role>
+ <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -364,12 +348,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>
@@ -414,10 +392,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>
@@ -430,8 +404,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>
@@ -449,8 +428,10 @@
<name>Change configuration</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Change local roles</name>
+ <role>Assignor</role>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change permissions</name>
@@ -470,11 +451,13 @@
</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>
@@ -489,15 +472,13 @@
</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='list'>
- <name>Edit CMFWiki Page</name>
- </permission>
<permission type='tuple'>
<name>Edit Factories</name>
<role>Manager</role>
@@ -506,8 +487,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>
@@ -554,11 +536,13 @@
<name>Manage Access Rules</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<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>
@@ -584,8 +568,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>
@@ -616,9 +601,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>
@@ -627,6 +609,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>
@@ -651,8 +637,9 @@
<name>Search ZCatalog</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Search for principals</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Set own password</name>
@@ -686,9 +673,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>
@@ -711,6 +695,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>
@@ -727,12 +715,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>Purchase Order Module</portal_type>
<title>Purchase Orders</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
index e7457ac15d..01f8b46a52 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
@@ -63,6 +63,9 @@
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Add CMF Calendar Tools</name>
+ </permission>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
<role>Manager</role>
@@ -88,9 +91,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>
@@ -99,30 +99,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='list'>
<name>Add Configured CMF Sites</name>
</permission>
@@ -244,16 +220,11 @@
<name>Add MessageCatalogs</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Page Templates</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
+ <permission type='list'>
+ <name>Add MimetypesRegistry Tools</name>
</permission>
<permission type='tuple'>
- <name>Add Photos</name>
+ <name>Add Page Templates</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -278,9 +249,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>
@@ -325,15 +293,15 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Add ZGDCharts</name>
+ <name>Add ZMailIn Clients</name>
+ </permission>
+ <permission type='list'>
+ <name>Add ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Add Zope Schedulers</name>
- </permission>
<permission type='tuple'>
<name>Add Zope Tutorials</name>
<role>Manager</role>
@@ -364,12 +332,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>
@@ -414,10 +376,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>
@@ -431,7 +389,10 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Change ZGDChart</name>
+ <name>Change ZMailIn</name>
+ </permission>
+ <permission type='list'>
+ <name>Change ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Change bindings</name>
@@ -472,9 +433,6 @@
<name>Copy or Move</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Create CMFWiki Page</name>
- </permission>
<permission type='tuple'>
<name>Create Transient Objects</name>
<role>Manager</role>
@@ -495,9 +453,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>
@@ -616,9 +571,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>
@@ -627,6 +579,9 @@
<name>Open/Close Database Connections</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Post mail to ZMailIn</name>
+ </permission>
<permission type='tuple'>
<name>Query Vocabulary</name>
<role>Manager</role>
@@ -686,9 +641,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>
@@ -711,6 +663,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>View ZMailMessage</name>
+ </permission>
<permission type='tuple'>
<name>View management screens</name>
<role>Manager</role>
@@ -727,12 +682,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>Purchase Packing List Module</portal_type>
<title>Purchase Packing Lists</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
index 067bbebaaf..61c9a30b30 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
@@ -116,14 +116,6 @@
<name>Add Cookie Crumblers</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Database Connections</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Database Methods</name>
<role>Manager</role>
@@ -244,14 +236,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
@@ -416,10 +392,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>
@@ -514,10 +486,6 @@
<name>Edit target</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Execute DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>FTP access</name>
<role>Manager</role>
@@ -700,10 +668,6 @@
<name>Use Factories</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Use external editor</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Use mailhost services</name>
<role>Manager</role>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
index 0c9c9c63fe..290f4958d8 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
@@ -52,8 +52,9 @@
<name>Add Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Action Icons Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMF Active Processs</name>
@@ -63,34 +64,38 @@
<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='list'>
+ <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'>
+ <permission type='tuple'>
<name>Add CMF Setup Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMF Sites</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Unique Id Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<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>
@@ -99,32 +104,9 @@
<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='list'>
+ <permission type='tuple'>
<name>Add Configured CMF Sites</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Content Type Registrys</name>
@@ -150,10 +132,11 @@
<name>Add ERP5 Forms</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add ERP5 OOo Templates</name>
+ <role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add ERP5 PDF Forms</name>
<role>Manager</role>
</permission>
@@ -189,8 +172,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>
@@ -245,26 +229,24 @@
<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'>
<name>Add Pluggable Index</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<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>
@@ -278,9 +260,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>
@@ -317,22 +296,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>
@@ -350,6 +332,8 @@
</permission>
<permission type='tuple'>
<name>Add portal folders</name>
+ <role>Assignor</role>
+ <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -364,12 +348,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>
@@ -414,10 +392,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>
@@ -430,8 +404,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>
@@ -449,8 +428,10 @@
<name>Change configuration</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Change local roles</name>
+ <role>Assignor</role>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change permissions</name>
@@ -470,11 +451,13 @@
</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>
@@ -489,15 +472,13 @@
</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='list'>
- <name>Edit CMFWiki Page</name>
- </permission>
<permission type='tuple'>
<name>Edit Factories</name>
<role>Manager</role>
@@ -506,8 +487,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>
@@ -554,11 +536,13 @@
<name>Manage Access Rules</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<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>
@@ -584,8 +568,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>
@@ -616,9 +601,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>
@@ -627,6 +609,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>
@@ -651,8 +637,9 @@
<name>Search ZCatalog</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Search for principals</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Set own password</name>
@@ -686,9 +673,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>
@@ -711,6 +695,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>
@@ -727,12 +715,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>Purchase Trade Condition Module</portal_type>
<title>Purchase Trade Conditions</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
index acddd24658..af02108077 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
@@ -116,14 +116,6 @@
<name>Add Cookie Crumblers</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Database Connections</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Database Methods</name>
<role>Manager</role>
@@ -244,14 +236,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
@@ -416,10 +392,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>
@@ -514,10 +486,6 @@
<name>Edit target</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Execute DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>FTP access</name>
<role>Manager</role>
@@ -700,10 +668,6 @@
<name>Use Factories</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Use external editor</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Use mailhost services</name>
<role>Manager</role>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
index 06f05276b9..7b1bcc5d74 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
@@ -63,6 +63,9 @@
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Add CMF Calendar Tools</name>
+ </permission>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
<role>Manager</role>
@@ -88,9 +91,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>
@@ -99,30 +99,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='list'>
<name>Add Configured CMF Sites</name>
</permission>
@@ -244,16 +220,11 @@
<name>Add MessageCatalogs</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Page Templates</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
+ <permission type='list'>
+ <name>Add MimetypesRegistry Tools</name>
</permission>
<permission type='tuple'>
- <name>Add Photos</name>
+ <name>Add Page Templates</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -278,9 +249,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>
@@ -325,15 +293,15 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Add ZGDCharts</name>
+ <name>Add ZMailIn Clients</name>
+ </permission>
+ <permission type='list'>
+ <name>Add ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Add Zope Schedulers</name>
- </permission>
<permission type='tuple'>
<name>Add Zope Tutorials</name>
<role>Manager</role>
@@ -364,12 +332,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>
@@ -414,10 +376,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>
@@ -431,7 +389,10 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Change ZGDChart</name>
+ <name>Change ZMailIn</name>
+ </permission>
+ <permission type='list'>
+ <name>Change ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Change bindings</name>
@@ -472,9 +433,6 @@
<name>Copy or Move</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Create CMFWiki Page</name>
- </permission>
<permission type='tuple'>
<name>Create Transient Objects</name>
<role>Manager</role>
@@ -495,9 +453,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>
@@ -616,9 +571,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>
@@ -627,6 +579,9 @@
<name>Open/Close Database Connections</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Post mail to ZMailIn</name>
+ </permission>
<permission type='tuple'>
<name>Query Vocabulary</name>
<role>Manager</role>
@@ -686,9 +641,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>
@@ -711,6 +663,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>View ZMailMessage</name>
+ </permission>
<permission type='tuple'>
<name>View management screens</name>
<role>Manager</role>
@@ -727,12 +682,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>Sale Order Module</portal_type>
<title>Sale Orders</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
index ea21be91cf..d160b72b30 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
@@ -63,6 +63,9 @@
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Add CMF Calendar Tools</name>
+ </permission>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
<role>Manager</role>
@@ -88,9 +91,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>
@@ -99,30 +99,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='list'>
<name>Add Configured CMF Sites</name>
</permission>
@@ -244,16 +220,11 @@
<name>Add MessageCatalogs</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Page Templates</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
+ <permission type='list'>
+ <name>Add MimetypesRegistry Tools</name>
</permission>
<permission type='tuple'>
- <name>Add Photos</name>
+ <name>Add Page Templates</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -278,9 +249,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>
@@ -325,15 +293,15 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Add ZGDCharts</name>
+ <name>Add ZMailIn Clients</name>
+ </permission>
+ <permission type='list'>
+ <name>Add ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Add Zope Schedulers</name>
- </permission>
<permission type='tuple'>
<name>Add Zope Tutorials</name>
<role>Manager</role>
@@ -364,12 +332,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>
@@ -414,10 +376,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>
@@ -431,7 +389,10 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Change ZGDChart</name>
+ <name>Change ZMailIn</name>
+ </permission>
+ <permission type='list'>
+ <name>Change ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Change bindings</name>
@@ -472,9 +433,6 @@
<name>Copy or Move</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Create CMFWiki Page</name>
- </permission>
<permission type='tuple'>
<name>Create Transient Objects</name>
<role>Manager</role>
@@ -495,9 +453,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>
@@ -616,9 +571,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>
@@ -627,6 +579,9 @@
<name>Open/Close Database Connections</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Post mail to ZMailIn</name>
+ </permission>
<permission type='tuple'>
<name>Query Vocabulary</name>
<role>Manager</role>
@@ -686,9 +641,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>
@@ -711,6 +663,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>View ZMailMessage</name>
+ </permission>
<permission type='tuple'>
<name>View management screens</name>
<role>Manager</role>
@@ -727,12 +682,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>Sale Packing List Module</portal_type>
<title>Sale Packing Lists</title>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
index 9397006ea5..f36111b2d3 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
@@ -116,14 +116,6 @@
<name>Add Cookie Crumblers</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Database Connections</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Database Methods</name>
<role>Manager</role>
@@ -244,14 +236,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
@@ -416,10 +392,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>
@@ -514,10 +486,6 @@
<name>Edit target</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Execute DCOracle2 Stored Procedures</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>FTP access</name>
<role>Manager</role>
@@ -700,10 +668,6 @@
<name>Use Factories</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Use external editor</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Use mailhost services</name>
<role>Manager</role>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
index 3e451f48dc..a4992b89d1 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
@@ -63,6 +63,9 @@
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Add CMF Calendar Tools</name>
+ </permission>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
<role>Manager</role>
@@ -88,9 +91,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>
@@ -99,30 +99,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='list'>
<name>Add Configured CMF Sites</name>
</permission>
@@ -244,16 +220,11 @@
<name>Add MessageCatalogs</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Page Templates</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
+ <permission type='list'>
+ <name>Add MimetypesRegistry Tools</name>
</permission>
<permission type='tuple'>
- <name>Add Photos</name>
+ <name>Add Page Templates</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -278,9 +249,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>
@@ -325,15 +293,15 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Add ZGDCharts</name>
+ <name>Add ZMailIn Clients</name>
+ </permission>
+ <permission type='list'>
+ <name>Add ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Add Zope Schedulers</name>
- </permission>
<permission type='tuple'>
<name>Add Zope Tutorials</name>
<role>Manager</role>
@@ -364,12 +332,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>
@@ -414,10 +376,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>
@@ -431,7 +389,10 @@
<role>Manager</role>
</permission>
<permission type='list'>
- <name>Change ZGDChart</name>
+ <name>Change ZMailIn</name>
+ </permission>
+ <permission type='list'>
+ <name>Change ZMailMessages</name>
</permission>
<permission type='tuple'>
<name>Change bindings</name>
@@ -472,9 +433,6 @@
<name>Copy or Move</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Create CMFWiki Page</name>
- </permission>
<permission type='tuple'>
<name>Create Transient Objects</name>
<role>Manager</role>
@@ -495,9 +453,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>
@@ -616,9 +571,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>
@@ -627,6 +579,9 @@
<name>Open/Close Database Connections</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Post mail to ZMailIn</name>
+ </permission>
<permission type='tuple'>
<name>Query Vocabulary</name>
<role>Manager</role>
@@ -686,9 +641,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>
@@ -711,6 +663,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>View ZMailMessage</name>
+ </permission>
<permission type='tuple'>
<name>View management screens</name>
<role>Manager</role>
@@ -727,12 +682,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>Sale Trade Condition Module</portal_type>
<title>Sale Trade Conditions</title>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 89a16a7ddc..a6b4ce8401 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-172
\ No newline at end of file
+176
\ No newline at end of file
--
2.30.9