diff --git a/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Account%20Module/fiscal_report.xml b/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Account%20Module/fiscal_report.xml
index c6d14c454c21e6d3861181fe8aba88b351b5c29e..d340f68696c304ef2451fcfabe62ba8b30a169f8 100644
--- a/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Account%20Module/fiscal_report.xml
+++ b/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Account%20Module/fiscal_report.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>fiscal_report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/fiscal_report.xml b/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/fiscal_report.xml
index 9305a570a199713a2dc8c0b10c3a5a66fa781728..490a10588a73b0b7e571d0223acbb893ace06f2b 100644
--- a/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/fiscal_report.xml
+++ b/bt5/erp5_accounting_l10n_fr/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/fiscal_report.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>fiscal_report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/career_print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/career_print.xml
index 58c6bca86622ed6ff0ff7ca79df132385e2c6dff..01e79018cbc34ec612c7be739ef52cf58995ab97 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/career_print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/career_print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>career_print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml
index 918e4c6149797ca1f11a72b102ce08c332f1e8cd..d85180cb91e695903649ffd608830e06fde90a9d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>csv_export</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml
index 2fc7e90dee932ecda36f4a44c7b97b2e51a51465..6b9754d164bbe1675e44aa51023d6a1b85a7710b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>csv_import</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/email_report.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/email_report.xml
index 6a2c2728235bb0b33bae608825a53ee414134986..162db08d917669861a6bdde6af8e1b277ea29550 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/email_report.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/email_report.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>email_report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/exchange.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/exchange.xml
index 819ce06f9712804af322fdf4859dd81472656b77..e57c1130e3431924ede0213beb3dc311b57942eb 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/exchange.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/exchange.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>exchange</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml
index d86f145433feca923a9b85647ee296e4f0010626..005c4ddb8515752043e5d3979506351026a28e4f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>list_emails</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml
index 4dbc5c46c31b56cbc4ee442e0e1dc751178f7238..7abbd98ba48e03b9eaa8c9642cf261cf15abf3cc 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>list_ui</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/report.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/report.xml
index 73324bd959732279ecbfce06ced4ee124e2b73eb..4818c4be9673b95a00722b5a34e9141729865e58 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/report.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/report.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search.xml
index 4925b62f46bd7282e615d0b591022385326d94b1..c0e3ac820102c0a49b052fa99b41e994a5fc8f43 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>search</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml
index 136ee2b380241fdeed4a4b01571282116fa40f31..e734ad7cdf054af6eaae5cfc73e23241e838866d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>search_phones</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml
index 4082c2afae6e878520b2b32d97cbe82f24f5fc28..49a99a5d66d8613b4c6a4d56267871693002318b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>sort_on</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
index f8c57d2c0936000ad0a441d63b5f152c4c73705a..03beb26dd9e2965195cebca509c40c20a5b751dd 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ModuleTemplateItem/currency_module.xml b/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
index 703e51129052b07fee12c91e96252e68b3bbf86f..5736010eff0b28b06b55f6a983e12ca96a8500ca 100644
--- a/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
@@ -1,544 +1,526 @@
 <module>
  <id>currency_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Manager</role>
    <role>Member</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml b/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
index 750f13f06d3d8b0c16db3faf89760e82696bd667..9f90f90f4212fffe205232f20b3e4ef23599e691 100644
--- a/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>organisation_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -11,11 +11,11 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -25,15 +25,15 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -43,483 +43,465 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <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>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -529,185 +511,167 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignee</role>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Assignee</role>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -717,7 +681,7 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -727,33 +691,33 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_base/ModuleTemplateItem/person_module.xml b/bt5/erp5_base/ModuleTemplateItem/person_module.xml
index ee8fbc66caf08b1a1ecbe073e4beda3bf826ed0b..0c4c3064cc33c754fdef18a4b4028e4347a8bd8a 100644
--- a/bt5/erp5_base/ModuleTemplateItem/person_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/person_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>person_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -11,11 +11,11 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -25,15 +25,15 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -43,465 +43,465 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Action Icons Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Calendar Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Default Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Setup Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Deferred Connections</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change local roles</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -511,169 +511,169 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Groups</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignee</role>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search for principals</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Assignee</role>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -683,7 +683,7 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -693,33 +693,33 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
index 81dc25dc8ab0331fecc1fa669cfdf882614442cf..cdb03241e077a4a5fe27a2b77ea378440adeae12 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
index 5ae6d9bfa5214adba1ad91bba141a84567efbd4c..71fed8dfdc0c2e47dbf0cdcc936ca3538a1159a2 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
index c81d36e5afd9c847238a54fbc453b1a27be8b7b9..3081a5c8c60a4b7ce5f74ef38c96e8ca750cdf4c 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml
index 215c566ae0e941133676200529d7b4f550163723..2d175f01ec23be69665bc6399e27afce081428e4 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
index a1a0752e31ec02691ed0facafd91f8f206bbdf14..b78b74a505ab1c52266581f6d00119ae62856618 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
index 5449632555c36b4ab3878dee51b794cee9f0ee75..fe440a7f7fbb64c13a48fa11779066f388062b29 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/ChatAddress.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/ChatAddress.xml
index 130e5f0c2c18561b0216967cb099f20a4345aed6..1064613d85bc501003e43214c7dbe862823e63fd 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/ChatAddress.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/ChatAddress.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
index c1bdcea3671128e50f51bd093d089ae1d4e5dd24..3dd0e6f110c4ae1522b461d40a617c7fdb133441 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
index 0b99dc98e1c386e36253590732f1b0d1448994b1..846e1cce610d89f7a9c8750cd204beda2ce56ebd 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
index 9f11d63e1130dfbd04841393cb7c89e91db35067..21b601a0c6cdf478c10df03ff1654bd93b3d0d6d 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
index eb635dbd8373440b5d14b4d279aa6c26c182346b..351e5ee048c4d24d710d4d3fca500265f8d786df 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml
index bf756c2eb4e3e443e86238afe08c0101cc7c623b..4219ca1eabe2bdc8cd45a1793894357a9cd2e6b8 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
index 34782445fd88fe6339996a8bb98c1cc43db90a84..c6ebaa49f78c0642a905d0447135c07ed0740e1f 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
index c00355b393e41fc4993024075ec3b6a6f2eb6f63..412b1f4eac7c716bb342ea53d140d8e7a4a6f7a4 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
index d2a6cd99155f439683f6553d70bbb7c8cb8bac66..752126f2ed723ed6112819113613e9e1ea5fb68c 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
index fc023e56d35e9da899cfe4ca57d0a5cdccf6aa5d..1e26ac45f091c3833077a76f281f4ef6a76c5f52 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
index 853bdc5fd9033609f894f3945ec28b57739846ab..f56c346c8b086a33179cde8eb2f725af3a871379 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
index 8093089fbbc0b57990215e56a4c5960fe15843fb..f50e40517bd1ff52b015f02f10a1423fceaf18ce 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation.xml
index 69b7fd0f41be999e4857f26984222443b14daf24..e63decbbf39c365d8e43601297d10b643cbfd62e 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
index d76a429ed996589d0e7771854c4272870d1fa81b..064d0da215425c53108adf5cec688a3c433f213c 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
index 11bb3fd91608bdc79db240c87334a497b2d32a23..1505a5bf00add145634edb8752d989b5247540a4 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml
index 520e6ce2f7139589d05e774556308658e6525cb4..08d28d7e03a67cb967aca6b87439c5b9f7ebedd6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>assignment_workflow</string> </value>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
index 78ab893a926b155c44cdf8e67e81edf13a69d95d..ced085c4b916115562bcb08437effc152fadbc5f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
index 0ad1db73b55383c3ded37ae04c7f45e3e3d770da..fc3d5c34addac2996ca3681b089c98375d69bc73 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/bank_account_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/bank_account_workflow.xml
index ff3c622f147eb2f8230037ecc1ce1e7d2b1b81e5..bb03416550e16a41c0c4fda61bf5976be8ab0995 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/bank_account_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/bank_account_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>bank_account_workflow</string> </value>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
index 0859d379c8b6cebb2d941cf2a0b007e616badb05..bfd4abe35e7594a6ef3f71a891bb0e47dcb0c458 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>career_workflow</string> </value>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
index f5b97e108816b1a8bd63a118d7b00e557ff24659..0948b4df561dfabb1dfc9a0d802e0a194265982f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>