diff --git a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
index 38239288a0e1ba5baa7201a6fb42b917b2531f59..1a6c59827ad5b0338e20d9af577172951b7ace8a 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
@@ -1,704 +1,678 @@
 <module>
  <id>internal_packing_list_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
    <role>SalesManager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
    <role>SalesManager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <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>
+  <permission type='list'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <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>
+  <permission type='list'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
    <role>SalesManager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
index e38f5556b6aad8e0f41ff7c4ba53abf642bcd781..8753d23632d513df2bfa557fce180803ac48569d 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
@@ -1,704 +1,678 @@
 <module>
  <id>inventory_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <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>
+  <permission type='list'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <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>
+  <permission type='list'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
index b23b642d013fd00a629b9523f49977b5c7aa0cd2..79227994094c7614602be7075e2cd18ca6ee451c 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>purchase_order_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,11 +10,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -40,476 +40,464 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <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>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -518,176 +506,162 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -696,7 +670,7 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -705,33 +679,33 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
index cbf2d66056b28b3995f0e166d499550af01cb51c..adb11509c23c9e85652ac5dcf8e5b381d091f218 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>purchase_packing_list_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,11 +10,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -40,476 +40,464 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <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>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -518,176 +506,162 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -696,7 +670,7 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -705,33 +679,33 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
index b3be13747efb4e4bc50e63934b73015e1096cc74..2b90dec94a720a516f4d5830f4b4cd5301b19dbd 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
@@ -1,541 +1,523 @@
 <module>
  <id>purchase_supply_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
index 545ae6c448e1f1f2035bfd8d7ed5055b5eef1921..1929fcc63d43bb1710fc1b5124e0501af4db1966 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>purchase_trade_condition_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,11 +10,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -40,476 +40,464 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <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>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -518,176 +506,162 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -696,7 +670,7 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -705,33 +679,33 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
index ed0e454bcfcdb9625bfdc80cef31012b04d32cab..3312b01527388a40a33bde3d173202560020d63e 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/returned_sale_packing_list_module.xml
@@ -1,541 +1,523 @@
 <module>
  <id>returned_sale_packing_list_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
index 79c110655bdb4fc3db3783a1884675cc0584b033..5ffd5804ec32c83b6a53e2202c5c4f665bbd744a 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>sale_order_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,11 +10,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -40,476 +40,464 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <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>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -518,176 +506,162 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -696,7 +670,7 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -705,33 +679,33 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
index c1c619edc2bcef8375c14dae3e5c0cb38baaba34..8bccb81fbf2ed1d84c701eb8e74803cb5f25f3b0 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>sale_packing_list_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,11 +10,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -40,476 +40,464 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <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>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -518,176 +506,162 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -696,7 +670,7 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -705,33 +679,33 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
index b4b9a8fdba316f3021da23494e9632ded01e7e82..8d201cf38a44df0bd245097750384002cf51d80a 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
@@ -1,541 +1,523 @@
 <module>
  <id>sale_supply_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
index fe9d39c3a5ea66428aaa337b4f90c59e02164722..1e513138e44282e8979b1caad4cfaf7e1169e24f 100644
--- a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>sale_trade_condition_module</id>
  <permission_list>
-  <permission>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,11 +10,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -40,476 +40,464 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='tuple'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
    <name>Add Portal ZSyncer Tools</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZSyncers</name>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <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>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -518,176 +506,162 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -696,7 +670,7 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -705,33 +679,33 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZSyncer: Use ZSyncer</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>