diff --git a/bt5/erp5_budget/ModuleTemplateItem/budget_module.xml b/bt5/erp5_budget/ModuleTemplateItem/budget_module.xml
index 3a7987b7709f5f8233bc1a645e90338f358dc71e..798930962692eacc4a7288b8e7d4fa5e08e12e6c 100644
--- a/bt5/erp5_budget/ModuleTemplateItem/budget_module.xml
+++ b/bt5/erp5_budget/ModuleTemplateItem/budget_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>budget_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <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='list'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <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='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>Assignee</role>
    <role>Assignor</role>
@@ -40,475 +40,463 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
   </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>Assignor</role>
    <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>Assignor</role>
    <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>Assignee</role>
    <role>Assignor</role>
@@ -517,179 +505,162 @@
    <role>Author</role>
    <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>
-   <name>Manage extensions</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>Assignor</role>
    <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>Assignee</role>
    <role>Assignor</role>
@@ -698,7 +669,7 @@
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -707,34 +678,34 @@
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
    <role>Assignor</role>
    <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_budget/ModuleTemplateItem/budget_transaction_module.xml b/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml
index aff6fd42ff17ca682008c1499d8fe93ac6d5243a..b72407ea34778a1693ad765aa15abea38e0da8ab 100644
--- a/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml
+++ b/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml
@@ -1,7 +1,7 @@
 <module>
  <id>budget_transaction_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -10,12 +10,12 @@
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -23,15 +23,15 @@
    <role>Manager</role>
    <role>Reviewer</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>Assignee</role>
    <role>Assignor</role>
@@ -40,479 +40,467 @@
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
    <role>Reviewer</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>Assignor</role>
    <role>Author</role>
    <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>Assignor</role>
    <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>Assignor</role>
    <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>Assignee</role>
    <role>Assignor</role>
@@ -521,179 +509,162 @@
    <role>Author</role>
    <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>
-   <name>Manage extensions</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>Assignor</role>
    <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>Assignee</role>
    <role>Assignor</role>
@@ -702,7 +673,7 @@
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
    <role>Assignee</role>
    <role>Assignor</role>
@@ -711,35 +682,35 @@
    <role>Manager</role>
    <role>Reviewer</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
    <role>Assignor</role>
    <role>Manager</role>
    <role>Reviewer</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_budget/PortalTypeTemplateItem/portal_types/Budget%20Cell.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Cell.xml
index a83380a0c329b98e89e38a1e86c314f7ff84e049..659597c9e88fd11987442b9af5bdb0fde4a3c5f0 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Cell.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Cell.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Line.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Line.xml
index 409ddc3276ac26b4fecfdc478c63853666f2ad70..0a706ace63e7e707b74d0dbbccf0996486a7662d 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Line.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Line.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Module.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Module.xml
index aa7cb001af120d0bd89f8358f779298bbaecf3a4..ff4b1c8ceb05b2ba4d35d0fcf44e6ae79cd50261 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Module.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Module.xml
@@ -185,6 +185,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction%20Module.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction%20Module.xml
index 5233b9c8f63292169c6d1d80e51bab2e981be2f9..a361e441ec286f07889e537626e14714e2d52486 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction%20Module.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction%20Module.xml
@@ -167,6 +167,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction.xml
index abf29bf29a9652fc4b60443e7787a91983ffa632..890448a2a5477d6dfcee40fd59f76a3581eb5db8 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transaction.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer%20Line.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer%20Line.xml
index 5f22dc49c53de7c86b50cdb95523574cb52ada90..446d9b695032e40c23d8e907beaa1a5c3c76decf 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer%20Line.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer%20Line.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer.xml
index ecfda4a26f17b38dd3e42ea012ed759cf7feab3a..7bb0558afa68cb20f834fe18475da906935ea1f4 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget%20Transfer.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
diff --git a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget.xml b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget.xml
index af7e01930e797f252df60ceb9a5cca2b784a1c26..8a119668fc3af19e9b0e819505c330d49b4efaa3 100644
--- a/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget.xml
+++ b/bt5/erp5_budget/PortalTypeTemplateItem/portal_types/Budget.xml
@@ -24,6 +24,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
@@ -102,7 +108,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Budget </string> </value>
+            <value> <string>Budget</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml
index 2fe110bea1858429703bdabb799d5d26877e547d..8e6742b12e8a56c85225d32787bd944dcf86b4dc 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml
index cc8ee83f1d9a5243495da5fd1d01492aedc9345e..935f922d1dcac37a80e02a7a92149e364ca6151b 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
index d7f2cc696d09ef713ae52b554c4d323c1a6ca595..4a7bba7be5acd42ea13faa947436add25a165254 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
index 1ff9e9b32ec63cfd0773e2d71ecad15862311fe2..23d82250b100aad19dbbda964102e09640830e1c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
index bd8a72c741eccfaf168f96602e6c08e1764d4152..2e198602479c504c17a8315bdcce07f76598e1b9 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml
index 8b36bcf38c3dd3725260fb2a91b52c58ab0ed489..3f087ec0dd783b6d2f9da87aa3b771b2edaddb8d 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml
index 0a9caca0318395cab03f946fbd97422763140539..2dbd3ff5dfb4d9ce90f1ce6bd73838eed8c9b090 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml
index 9810fe0508c06718e337857b6039f9ec422ae9c9..9568f45348022b7548ac784408a4ff6e9f56a483 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml
index 0a1572e2e049e788cd8c1f0d9118c004fad687c7..a65e8c2d31d658601ce7e9060cc16e35648b8e77 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>budget_line_interaction_workflow</string> </value>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml
index 4f0691eb23f2033a9ffc3031684b9e376cfc0943..c56a45d895af8cf5da0666e8d3302d6de380e1ff 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml
index a84305105afb8b2854dd2665edb7a10e13787fd9..98ca2859a40b86ef10d972e501e51146a98f0ee1 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>budget_transaction_workflow</string> </value>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml
index ad1a10dadaea91aa0b62e93227397186a721cf16..e9c719ac9e1063b60f58434d5f8ac180c5df86a9 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
index f3652bf1c1808e4ff035d0915c1d3a70b540fd0c..a36ba9b705c0d460384158675740a8772a58e2e3 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>budget_workflow</string> </value>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml
index b30f678c3e52250cccb293d0cd5cdd47504d2479..0e8ff6d1de919947dd48ec7361a48b32fe7e1af3 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/Budget_checkConsistency.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
diff --git a/bt5/erp5_budget/bt/maintainer_list b/bt5/erp5_budget/bt/maintainer_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_budget/bt/template_update_business_template_workflow b/bt5/erp5_budget/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547
--- /dev/null
+++ b/bt5/erp5_budget/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_budget/bt/template_update_tool b/bt5/erp5_budget/bt/template_update_tool
new file mode 100644
index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547
--- /dev/null
+++ b/bt5/erp5_budget/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file