From 6fb31e585656f375e4352d21b502997a50791929 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Mon, 29 May 2006 08:25:49 +0000
Subject: [PATCH] Only update BT5 format.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7514 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../jump_to_related_apparel_cloth.xml         | 10 +--
 .../apparel_assortment_module.xml             | 88 +++++++------------
 .../apparel_bath_module.xml                   | 78 +++++++---------
 .../apparel_cloth_module.xml                  | 88 +++++++------------
 .../apparel_colour_range_module.xml           | 88 +++++++------------
 .../apparel_component_module.xml              | 88 +++++++------------
 .../apparel_consumption_module.xml            | 88 +++++++------------
 .../apparel_fabric_item_module.xml            | 88 +++++++------------
 .../apparel_fabric_module.xml                 | 88 +++++++------------
 .../apparel_measurement_module.xml            | 88 +++++++------------
 .../apparel_model_module.xml                  | 88 +++++++------------
 .../apparel_shape_module.xml                  | 88 +++++++------------
 .../apparel_size_module.xml                   | 88 +++++++------------
 .../apparel_transformation_module.xml         | 88 +++++++------------
 ...arel%20Assortment%20Colour%20Variation.xml |  6 ++
 .../Apparel%20Assortment%20Module.xml         |  6 ++
 .../portal_types/Apparel%20Assortment.xml     |  6 ++
 .../portal_types/Apparel%20Bath%20Module.xml  |  6 ++
 .../portal_types/Apparel%20Bath.xml           |  6 ++
 .../portal_types/Apparel%20Cloth%20Module.xml |  6 ++
 .../portal_types/Apparel%20Cloth.xml          |  6 ++
 .../Apparel%20Colour%20Range%20Module.xml     |  6 ++
 .../Apparel%20Colour%20Range%20Variation.xml  |  6 ++
 .../portal_types/Apparel%20Colour%20Range.xml |  6 ++
 .../Apparel%20Component%20Module.xml          |  6 ++
 .../Apparel%20Component%20Variation.xml       |  6 ++
 .../portal_types/Apparel%20Component.xml      |  6 ++
 .../Apparel%20Consumption%20Module.xml        |  6 ++
 .../portal_types/Apparel%20Consumption.xml    |  6 ++
 .../Apparel%20Fabric%20Colour%20Variation.xml |  6 ++
 .../Apparel%20Fabric%20Item%20Module.xml      |  6 ++
 .../portal_types/Apparel%20Fabric%20Item.xml  |  6 ++
 .../Apparel%20Fabric%20Module.xml             |  6 ++
 .../portal_types/Apparel%20Fabric.xml         |  6 ++
 .../Apparel%20Measurement%20Module.xml        |  6 ++
 .../portal_types/Apparel%20Measurement.xml    |  6 ++
 .../Apparel%20Model%20Colour%20Variation.xml  |  6 ++
 .../portal_types/Apparel%20Model%20Module.xml |  6 ++
 ...parel%20Model%20Morphology%20Variation.xml |  6 ++
 .../portal_types/Apparel%20Model.xml          |  6 ++
 .../portal_types/Apparel%20Shape%20Module.xml |  6 ++
 .../portal_types/Apparel%20Shape.xml          |  6 ++
 .../portal_types/Apparel%20Size%20Module.xml  |  6 ++
 .../portal_types/Apparel%20Size.xml           |  6 ++
 .../Apparel%20Technical%20Drawing.xml         |  6 ++
 ...20Transformation%20Assorted%20Resource.xml |  6 ++
 .../Apparel%20Transformation%20Module.xml     |  6 ++
 .../Apparel%20Transformation%20Operation.xml  |  6 ++
 ...ransformation%20Transformed%20Resource.xml |  6 ++
 .../portal_types/Apparel%20Transformation.xml |  6 ++
 .../erp5_apparel/ApparelCloth_asCellRange.xml |  4 +-
 .../ApparelFabricItem_fastInput.xml           |  4 +-
 .../ApparelFabricItem_getFastInputList.xml    |  4 +-
 .../erp5_apparel/ApparelFabricItem_init.xml   |  4 +-
 .../ApparelFabric_asCellRange.xml             |  4 +-
 .../ApparelMeasurement_asCellRange.xml        |  4 +-
 .../erp5_apparel/ApparelModel_asCellRange.xml |  4 +-
 ...lModel_copyApparelColourRangeVariation.xml |  4 +-
 ...getAggregatedBillOfMaterialDescription.xml |  4 +-
 ...AggregatedIndustrialProcessDescription.xml |  4 +-
 .../erp5_apparel/ApparelSize_asCellRange.xml  |  4 +-
 .../apparel_cloth_workflow.xml                |  6 ++
 .../apparel_model_workflow.xml                |  6 ++
 .../apparel_shape_workflow.xml                |  6 ++
 .../apparel_validation_workflow.xml           |  6 ++
 65 files changed, 677 insertions(+), 751 deletions(-)

diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml
index 3e41cee73c..55706873d2 100644
--- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml
+++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Measurement/jump_to_related_apparel_cloth.xml
@@ -4,20 +4,14 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
index 3b925bc6ed..5f598ca369 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
index dc3e657cf4..9c1fa64312 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
@@ -29,10 +29,10 @@
    <name>Add BTreeFolder2s</name>
   </permission>
   <permission>
-   <name>Add Base18 Tools</name>
+   <name>Add Browser Id Manager</name>
   </permission>
   <permission>
-   <name>Add Browser Id Manager</name>
+   <name>Add CMF Action Icons Tools</name>
   </permission>
   <permission>
    <name>Add CMF Active Processs</name>
@@ -40,32 +40,38 @@
   <permission>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
   </permission>
   <permission>
    <name>Add CMFMailIn Tools</name>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -116,7 +122,7 @@
    <name>Add ERP5Form Tools</name>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -151,9 +157,6 @@
   <permission>
    <name>Add Localizers</name>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
   </permission>
@@ -172,6 +175,9 @@
   <permission>
    <name>Add Pluggable Index</name>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -214,6 +220,9 @@
   <permission>
    <name>Add Z MySQL Database Connections</name>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
   </permission>
@@ -247,15 +256,9 @@
   <permission>
    <name>Add portal topics</name>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
   </permission>
@@ -319,6 +322,9 @@
   <permission>
    <name>Change configuration</name>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
   </permission>
@@ -331,15 +337,9 @@
   <permission>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
   </permission>
@@ -355,12 +355,6 @@
   <permission>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-  </permission>
   <permission>
    <name>Edit Factories</name>
   </permission>
@@ -397,6 +391,9 @@
   <permission>
    <name>Manage Access Rules</name>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
   </permission>
@@ -415,9 +412,6 @@
   <permission>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
   </permission>
@@ -430,30 +424,15 @@
   <permission>
    <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>
    <name>Manage users</name>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
   </permission>
   <permission>
    <name>Modify portal content</name>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
   </permission>
@@ -481,6 +460,9 @@
   <permission>
    <name>Search ZCatalog</name>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
   </permission>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
index ff7828d348..d02fba4fa1 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
index e8ebf573b5..f80274e491 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
index 4ccdac02b7..bb1d5b18de 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
index 7590588728..4f640a2509 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
index 08a258c529..1c6ac8f850 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
@@ -37,13 +37,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -52,32 +52,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -85,8 +89,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -152,7 +155,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -198,9 +201,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -225,6 +225,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -280,6 +283,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -323,17 +329,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -418,6 +417,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -434,17 +436,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -465,13 +460,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -520,6 +508,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -544,9 +535,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -563,23 +551,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -588,10 +563,6 @@
    <name>Modify portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -628,6 +599,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
index c369dc4a63..3419b615ff 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
index c702ea99fb..97ed9e491b 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
index 8f8275119c..df50e55931 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
index de5cda4ee8..e96ebddd0c 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
index 75984fe789..e5cb6907e9 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
@@ -37,13 +37,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -52,32 +52,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -85,8 +89,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -152,7 +155,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -198,9 +201,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -225,6 +225,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -280,6 +283,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -323,17 +329,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -418,6 +417,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -434,17 +436,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -465,13 +460,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -520,6 +508,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -544,9 +535,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -563,23 +551,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -588,10 +563,6 @@
    <name>Modify portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -628,6 +599,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
index 487d01ae04..ad7e847dca 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
@@ -52,13 +52,13 @@
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
   <permission>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
@@ -67,32 +67,36 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add CMF Default Tools</name>
+  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
+   <name>Add CMF Setup Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFCalendar Tools</name>
-   <role>Manager</role>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
   <permission>
-   <name>Add CMFCategory Tools</name>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFDefault Tools</name>
+   <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -100,8 +104,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+   <name>Add Configured CMF Sites</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -167,7 +170,7 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add ERP5Shop Tools</name>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
@@ -213,9 +216,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -240,6 +240,9 @@
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Plugin Registrys</name>
+  </permission>
   <permission>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
@@ -295,6 +298,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
   <permission>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
@@ -340,17 +346,10 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -435,6 +434,9 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Change local roles</name>
+  </permission>
   <permission>
    <name>Change permissions</name>
    <role>Manager</role>
@@ -451,17 +453,10 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Create Transient Objects</name>
    <role>Manager</role>
@@ -482,13 +477,6 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
@@ -542,6 +530,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Manage Groups</name>
+  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -566,9 +557,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -585,23 +573,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -611,10 +586,6 @@
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
@@ -651,6 +622,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Search for principals</name>
+  </permission>
   <permission>
    <name>Set own password</name>
    <role>Manager</role>
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml
index d19b733a9b..771a337b0f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Colour%20Variation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml
index 8c8acd2a48..43b8aff811 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml
index 4cf1b0af07..5688917bd1 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml
index 6cf34dea8f..6614b8fcee 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml
index 9c2609b5b0..58dc79991f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Bath.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml
index 899a29ad7a..cfebfb9d5b 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
index f4640f46e7..0fecfd1d7f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml
index fd9dba60e7..1ffc47f086 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml
index 6e4603eb8f..faae68da7c 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range%20Variation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
index 79383a3d74..50dfa40b7e 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Colour%20Range.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml
index b8d01cbec1..d3f5255306 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml
index 369b7d6233..3928cfa20b 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component%20Variation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml
index ac507822b3..92c2dcbabc 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml
index a827c32bb6..5c2c3749d2 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml
index 833190f3dc..b6646789bf 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Consumption.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml
index 776acbb189..bc45282ab5 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Colour%20Variation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml
index 40993e6e52..a4257f003b 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml
index 11a8220662..2bb7e14910 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Item.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml
index b6900cda20..4fbe5fde87 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml
index 2d54cfa699..a8b88e668a 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml
index a82a02fbba..c737fc031f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml
index f116bfe9d9..7330db8841 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Measurement.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml
index a413488393..6f22aed999 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Colour%20Variation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml
index 4cdb0e0708..2d083ee64f 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml
index 4dd9519724..d5b6e80c00 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model%20Morphology%20Variation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
index 9f750540fe..056a4ef95d 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml
index 2dcdeb1cfe..8acc878214 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml
index 910dacaae3..b608b733fd 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Shape.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml
index e1048e52a6..0dc7a2ca17 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml
index 1ca9a939ec..c7e34d566b 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Size.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml
index 0933e1e12e..f640b58432 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Technical%20Drawing.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml
index 4fc2770e58..9108679f60 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Assorted%20Resource.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml
index 56b6a18e93..748f6c2b93 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Module.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml
index ce58eab1c3..7b8350b0ad 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Operation.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml
index eabc2eb8ea..16256641ed 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation%20Transformed%20Resource.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_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml
index 46926e817d..85f3c1ecbd 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Transformation.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml
index d4c47e0af9..b69d761508 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_fastInput.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_fastInput.xml
index 4beb036d4f..fa6fe77a1c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_fastInput.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_fastInput.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_getFastInputList.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_getFastInputList.xml
index 8fd675de96..9fa436baed 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_getFastInputList.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_getFastInputList.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_init.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_init.xml
index eb1754854e..4bad5fad04 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_init.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_init.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_asCellRange.xml
index 7eda4be4cd..c71efaf5a8 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_asCellRange.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_asCellRange.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelMeasurement_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelMeasurement_asCellRange.xml
index 469dddad83..188376f374 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelMeasurement_asCellRange.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelMeasurement_asCellRange.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_asCellRange.xml
index 09b1f3a557..6bd84b3f1c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_asCellRange.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_asCellRange.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyApparelColourRangeVariation.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyApparelColourRangeVariation.xml
index 32133073d7..37aa9042a5 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyApparelColourRangeVariation.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyApparelColourRangeVariation.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedBillOfMaterialDescription.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedBillOfMaterialDescription.xml
index 32d77c9f9b..c0b0bf4fed 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedBillOfMaterialDescription.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedBillOfMaterialDescription.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedIndustrialProcessDescription.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedIndustrialProcessDescription.xml
index 7e60657df0..6d4d73812b 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedIndustrialProcessDescription.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getAggregatedIndustrialProcessDescription.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_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml
index dea9827a98..92ccd8a92d 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.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_apparel/WorkflowTemplateItem/portal_workflow/apparel_cloth_workflow.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_cloth_workflow.xml
index 984361f32e..957e0910f4 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_cloth_workflow.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_cloth_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>apparel_cloth_workflow</string> </value>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow.xml
index 4ec905cd07..2cfed6b110 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_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>apparel_model_workflow</string> </value>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_shape_workflow.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_shape_workflow.xml
index cf7c3e644f..94119fdaea 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_shape_workflow.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_shape_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>apparel_shape_workflow</string> </value>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_validation_workflow.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_validation_workflow.xml
index 049529684c..ffaee37a0d 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_validation_workflow.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_validation_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>apparel_validation_workflow</string> </value>
-- 
2.30.9