diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/metadata.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/metadata.xml
index f44d98f7d44d3ddeb63dd18a8c1815e1794dd532..fab1eede4c5ae3a59a4f81ae33b8ce9e10ae5aa6 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/metadata.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/view.xml
index 48298c0f84af5e4f4cc3c29ff2d56c7b0f8a0e4f..49d196b50a61d6caece895058dd822302c0ab84e 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Module/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Module/view.xml
index 35d2bcd320284223f4f53afd2c8d3cd137f3e77f..1588d7089f6474dee0ef2150f4eaac09f1415e85 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Module/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/metadata.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/metadata.xml
index f44d98f7d44d3ddeb63dd18a8c1815e1794dd532..fab1eede4c5ae3a59a4f81ae33b8ce9e10ae5aa6 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/metadata.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/view.xml
index 967e5e56e0dc976a4e658537dadf14032f7443fb..450f73891530415fa49e8f746e753507ec16e1db 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Bank%20Account%20Inventory/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Cell/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Cell/view.xml
index 2d20639e62c87f990debe77e44d5557ff1f2681b..1e0a1a52777d2a37cc0fd5b45064ecabede2b659 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Cell/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/metadata.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/metadata.xml
index 3154d03e95f59a264432363d426e361ef014fb35..2cc8e01fedc0ca31c93d1f15997b5b15ac5bdbbb 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/metadata.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/view.xml
index 995d76a1505af36ab5a2ea50831036956bbd0611..5d3e6c17eafe7ee619c6081a7a3227641680d945 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Group/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/metadata.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/metadata.xml
index f44d98f7d44d3ddeb63dd18a8c1815e1794dd532..fab1eede4c5ae3a59a4f81ae33b8ce9e10ae5aa6 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/metadata.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/view.xml
index 7bc20080df79ff3424bfc61e150c595ac9cd677b..b7a356de11b16d529272bac63d39ae9d0b5fb920 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Module/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Module/view.xml
index b230885e951af30e27ed51dbb3e5d9149474e9dd..377fa8be9a839344015720227da2ebfeb06863a1 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Module/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/fastinput.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/fastinput.xml
index 930cbe4156e998f678d0f25a9d9f5734cbbda554..ea0c8700d3892b7aa23f0f8d7df3095218a8d011 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/fastinput.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/fastinput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/history.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/history.xml
index ca301fc42629b8a1824fe9c480c6b9fadc36d3c8..820ba01de78124de24e43856ceea1c6486a78edd 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/history.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.5</float> </value>
+            <value> <float>4.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/metadata.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/metadata.xml
index f44d98f7d44d3ddeb63dd18a8c1815e1794dd532..7ff4da7080cf7fcc66bd2af2aa5a6295e2f2548f 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/metadata.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
+            <value> <float>5.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/view.xml b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/view.xml
index 6aba0ea563e7506783af633cf4341538526aea7d..a11ffa232199a2c1e12f07c25bc09a19b22d0bd0 100644
--- a/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/view.xml
+++ b/bt5/erp5_banking_inventory/ActionTemplateItem/portal_types/Cash%20Inventory/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/ModuleTemplateItem/bank_account_inventory_module.xml b/bt5/erp5_banking_inventory/ModuleTemplateItem/bank_account_inventory_module.xml
index bdc0ad32be325243140917efc0edc1e258dbe765..4f7ece5dcf2aba679191cd6f109610e2e870f110 100644
--- a/bt5/erp5_banking_inventory/ModuleTemplateItem/bank_account_inventory_module.xml
+++ b/bt5/erp5_banking_inventory/ModuleTemplateItem/bank_account_inventory_module.xml
@@ -279,10 +279,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -299,21 +295,13 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='list'>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
@@ -410,14 +398,6 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
@@ -454,9 +434,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -486,10 +463,16 @@
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit ParsedXML</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -539,6 +522,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -603,10 +589,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -684,6 +666,9 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>View DOM hierarchy</name>
+  </permission>
   <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
@@ -693,10 +678,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_inventory/ModuleTemplateItem/cash_inventory_module.xml b/bt5/erp5_banking_inventory/ModuleTemplateItem/cash_inventory_module.xml
index 3666cfc4e6bb19264c51d80625b7f958e4d32306..359682b0c4fd3948e9d4c57a8cb3c153e6fb0f5e 100644
--- a/bt5/erp5_banking_inventory/ModuleTemplateItem/cash_inventory_module.xml
+++ b/bt5/erp5_banking_inventory/ModuleTemplateItem/cash_inventory_module.xml
@@ -273,10 +273,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -293,21 +289,13 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='list'>
+   <name>Add Z MySQL Deferred Database Connections</name>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
@@ -404,14 +392,6 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
@@ -447,9 +427,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -479,10 +456,16 @@
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit ParsedXML</name>
+  </permission>
   <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -531,6 +514,9 @@
   <permission type='tuple'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -595,10 +581,6 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
@@ -675,6 +657,9 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>View DOM hierarchy</name>
+  </permission>
   <permission type='tuple'>
    <name>View History</name>
    <role>Assignee</role>
@@ -684,10 +669,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Line.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Line.xml
index d1300241bf020c2f54f4406a62ee0621a8f81eba..29f3c452d10cee2f3f61ff9ff76dd68e0d745f40 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Line.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Module.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Module.xml
index fbbd89d49c20c8862eb93ff3ba59629074a6c943..dc8ba1672c4e465a7d8420c23a41c294a02c431a 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Module.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory.xml
index fa0b713d5bd2406fa30532f2ddad56e491f3094d..ea318e3dded6f5a1a1daa241f15f1cd951d5c5f8 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Bank%20Account%20Inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Cell.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Cell.xml
index 77ebfba6549358d88e3fa859a42ee522b5e5602a..7e005cba39c477ca5b697e957b03190eaf990c89 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Cell.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Group.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Group.xml
index 5cf1a95473f6ea875e48780f0be2d57c8900c3b8..bcbc5d58236b141cc7d9571cc70958d718c00fc9 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Group.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Line.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Line.xml
index 9fbe5b5ffff2e832d48f5f629b2d8cd55fa7769c..00928b06b967afeb7fd586c4fb30340b8970d8e9 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Line.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Module.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Module.xml
index 1c52af39a6919a64c1a9db7da4084145e9fa84c6..6e623f0a34adc1d1e8b3c928117d84d4448672f1 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Module.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory.xml b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory.xml
index 3a9f0a18177410ddfa35c7ded4034250b1433e1b..5543a2db8466d4ba66c9ebca2a4c62a608516cd6 100644
--- a/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory.xml
+++ b/bt5/erp5_banking_inventory/PortalTypeTemplateItem/portal_types/Cash%20Inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory.xml
index 59d286008a72087e3441c9f15dccdd02bd3efd8c..b18c923d80e1f33829943798a92480bedf066fb4 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountCurrencyTitle.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountCurrencyTitle.xml
index bcdf3c0aa4e90c641f2ab4b114a1b41604064e70..5ce61817f777ecfb5bf76678f435b04c5db4bb16 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountCurrencyTitle.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountCurrencyTitle.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,7 +76,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountCurrencyTitle</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountNumber.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountNumber.xml
index fc58acdcdaf78ebd7283acfab71e25a2e490c7d2..f2ab84858c5b3b919a0220809e050ae23bf24621 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountNumber.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountNumber.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,7 +76,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_getBankAccountNumber</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml
index e40439d5c49e28a1c7756110896f39a628acd9c0..dc25224c60dd9b59fc1d6c5060402f73febb15c8 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_destination_payment_reference.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_destination_payment_reference.xml
index 33935d52efc9809e5e47b1834586311c90dcbb58..dc5900170523e7e23fd6b78cd891f1fa6c6f26c8 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_destination_payment_reference.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_destination_payment_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -304,7 +301,9 @@
                 </item>
                 <item>
                     <key> <string>parameter_list</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>portal_type</string> </key>
@@ -376,7 +375,24 @@
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>getReference</string>
+                          <string>Account Number</string>
+                        </tuple>
+                        <tuple>
+                          <string>getInternalReference</string>
+                          <string>Internal Account Number</string>
+                        </tuple>
+                        <tuple>
+                          <string>getBicCode</string>
+                          <string>BIC Code</string>
+                        </tuple>
+                        <tuple>
+                          <string>getParentTitle</string>
+                          <string>Owner</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -401,7 +417,7 @@
                 </item>
                 <item>
                     <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
+                    <value> <int>24</int> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -449,6 +465,14 @@
                     <key> <string>max_length</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>max_linelength</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_lines</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>parameter_list</string> </key>
                     <value>
@@ -513,11 +537,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -529,4 +550,20 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: [(\'site_uid\',here.Baobab_getUserSiteUid()), (\'validation_state\', \'valid\')]</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml
index 9a84cb5631ccf122ad0a2deacc8f68cc6f767f2a..8ccaeb0aaec024c347f3e7cb545a7ffd1d7bb473 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_resource.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_resource.xml
index 8e93bb184a5919c88ba145d73a0b0ccc64b4d65e..50c15412e8c5a1c77e9a9c196d7904fb8c79615c 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_resource.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_resource.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory.xml
index 33fba39887ae1454913995a6ab89bc6713a579f3..8f3caaa2dc64a3849351327df2b73eff70dff8b9 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -67,7 +64,8 @@
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>Default</string>
+                <string>bottom</string>
+                <string>hidden</string>
               </list>
             </value>
         </item>
@@ -76,13 +74,19 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>Default</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory/listbox.xml
index c6659c736e8b1d7b0f7cf096e14e1d56bd1af10b..b2bdc6224f4aa3b88b813540a009ef78d1e25d05 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory/listbox.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryModule_viewBankAccountInventory/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -303,10 +300,6 @@
                     <key> <string>columns</string> </key>
                     <value>
                       <list>
-                        <tuple>
-                          <string>id</string>
-                          <string>ID</string>
-                        </tuple>
                         <tuple>
                           <string>title</string>
                           <string>Title</string>
@@ -406,6 +399,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string>EmptyByDefaultListBox_asHTML</string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -459,7 +456,12 @@
                 <item>
                     <key> <string>sort_columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>stop_date</string>
+                          <string>Inventory Date</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -491,11 +493,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view.xml
index 77893a520edca3cec5761c0756a9bdc73d27aa5a..a097e40e42cfdd94886d89b9400f2567e392c031 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml
index f3ae027a712c94a1d9ae9edcc16527e03fff5a41..ea4e9371f9442f038276e12e8366e7f9168b11fa 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_description.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_description.xml
index 9ec80bad08524bfdc1ee4872472ba36fed63cc6b..b8755f417d69ad8d5cc47e8e464552ca136f4348 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_description.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_destination.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_destination.xml
index e1b338dd468e7b9354b9e94d79b63f9e7fbffbbb..73febf2f9f2740dd83192be00089c43a0d4b7dcb 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_destination.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_destination.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_id.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_id.xml
index 5f4191cf8c23be8ade5337ee473771e9ceeca537..739c8a9a9a3b4d277caf3290a4e3cd099533de9b 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_id.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_id.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_start_date.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_start_date.xml
index 814ff6ab2c50810229a02b870683bb4eba68197a..00160ffafb809cc748b5a3624296863fcac8724a 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_start_date.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_title.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_title.xml
index 8290890b6cb79313dd4d24ecc73be7f145f6ed89..444c211a1b7c889ac2cf54ab2091ffdae8d7b808 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_title.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view.xml
index 9bdaca69c6fc6cdcf2e8f179b14ed10d0f078a29..90ebcf3e79bce7c93dd5e3c0f0504865a6083a96 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml
index 3748800f3218fb5b1997583c1f5368ca242eee28..55e48806c538345a4a0eb890d353275de9c3d0cc 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -445,6 +442,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -560,7 +561,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>searchFolder</string> </value>
+            <value> <string>objectValues</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_destination.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_destination.xml
index a2f9d53d78d0d30e56bca8757610d8a05bf9c908..890676099e29996ac3b78824d0121aafa2b98ea0 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_destination.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_destination.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_total_price.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_total_price.xml
index 90cde58de2bb0ac992d7a2e3cca54971f7d33dc7..acdcb88825105904a0bae37ac6691e47d9459490 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_total_price.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox_total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -264,11 +261,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -283,18 +277,15 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.gePriceCurrencyValue().getQuantityPrecision()</string> </value>
+            <value> <string>python: here.getPriceCurrencyValue().getQuantityPrecision()</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_description.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_description.xml
index 9ec80bad08524bfdc1ee4872472ba36fed63cc6b..b8755f417d69ad8d5cc47e8e464552ca136f4348 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_description.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_id.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_id.xml
index 3f047cad364862e50db2c1e037abb66b7e8562bc..767673fec619009bf6bfa43603309e81e03642c3 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_id.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_id.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_start_date.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_start_date.xml
index 0a73cb147ca04837265455cf8c966db39811178d..996b800eb73c6d3d8413e7c853fe0efec1e77cab 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_start_date.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_title.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_title.xml
index 8290890b6cb79313dd4d24ecc73be7f145f6ed89..444c211a1b7c889ac2cf54ab2091ffdae8d7b808 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_title.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view.xml
index 3d8114e638a331f77522b796796e4e1f0adece9f..d80af9c96c4020978a28d60b0710d307c04c7275 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/mapped_value_property_list.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/mapped_value_property_list.xml
index 862f9254a165bd178997014d9870e52d917ed4fa..6f27fa992561f102299cb92762817edaecbedb3f 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/mapped_value_property_list.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/mapped_value_property_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox.xml
index 5597cf344e4ef08e2a7ab597ab69b423e598d1ab..8aca637495840babfcfef5cd30d1f4c12a492a2c 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MatrixBox</string>
-          <string>MatrixBox</string>
-        </tuple>
-        <none/>
+        <global name="MatrixBox" module="Products.ERP5Form.MatrixBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_membership_criterion_category_list.xml
index 8441b7f5dd389f113aed8f037965a1efc6c4303f..dc336b672cf4c7c6e91443e1f8c26f82833facc6 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_membership_criterion_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_quantity.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_quantity.xml
index 021812358b9ca1769585c279a83253670ae67a94..355b79ba381fa2d457de98e451c313747b768a85 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_quantity.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/matrixbox_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/membership_criterion_base_category_list.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/membership_criterion_base_category_list.xml
index 8b7167a9b277422f75c8294f6a40a11195fd283f..8edccd49aa464d99773fa4a967bf7db849b30d7b 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/membership_criterion_base_category_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_resource_translated_title.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_resource_translated_title.xml
index 81325b241679bd426416c7148acb1fa745a45e79..9934984bd4a51dac24163e08d2f57ad745f3c019 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_resource_translated_title.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_resource_translated_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_total_price.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_total_price.xml
index b39e8244a3b155879ae910f6c20806ae89bc6e89..e7845f360be8dfe8363a783d5a71351971e70d45 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_total_price.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryLine_view/my_total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup.xml
index a47b918228e525e650b69a6017545d9adfd221cb..428868afc85efad85d3da79ba7ebcff9a01bff81 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -67,7 +64,7 @@
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>Default</string>
+                <string>bottom</string>
                 <string>hidden</string>
               </list>
             </value>
@@ -77,7 +74,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>Default</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup/listbox.xml
index 265b495603fd1362dbe4e40173df158d1336c932..6408d7f99200323df070513c64f26abec694d552 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup/listbox.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryModule_viewCashInventoryGroup/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -303,10 +300,6 @@
                     <key> <string>columns</string> </key>
                     <value>
                       <list>
-                        <tuple>
-                          <string>id</string>
-                          <string>ID</string>
-                        </tuple>
                         <tuple>
                           <string>title</string>
                           <string>Title</string>
@@ -404,6 +397,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string>EmptyByDefaultListBox_asHTML</string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -457,7 +454,12 @@
                 <item>
                     <key> <string>sort_columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>stop_date</string>
+                          <string>Date</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -489,11 +491,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -508,11 +507,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view.xml
index 583046df85678870e12511dfc1ce81d0f44c6643..9a78696dc6c6f707a61772b1f36725ff87db60fc 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>bottom</string> </key>
+                    <key>                 <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -88,22 +85,22 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>center</string> </key>
+                    <key>                 <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key> <string>hidden</string> </key>
+                    <key>                 <string>hidden</string> </key>
                     <value>
                       <list>
+                        <string>listbox_quantity</string>
                         <string>listbox_total_price</string>
-                        <string>listbox_total_quantity</string>
                       </list>
                     </value>
                 </item>
                 <item>
-                    <key> <string>left</string> </key>
+                    <key>                 <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_destination</string>
@@ -113,7 +110,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>right</string> </key>
+                    <key>                 <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox.xml
index 8d4748f9e878afe6bc000bdfd35c80243f8c7e04..f7763370f5d6edfe46ec29f473f375c540ce0217 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -41,10 +38,6 @@
                     <key> <string>all_columns</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>all_editable_columns</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
@@ -54,11 +47,11 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>css_class</string> </key>
+                    <key> <string>count_method</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>default</string> </key>
+                    <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -117,6 +110,10 @@
                     <key> <string>meta_types</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value> <string></string> </value>
@@ -180,10 +177,6 @@
                     <key> <string>all_columns</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>all_editable_columns</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
@@ -193,11 +186,11 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>css_class</string> </key>
+                    <key> <string>count_method</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>default</string> </key>
+                    <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -256,6 +249,10 @@
                     <key> <string>meta_types</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value> <string></string> </value>
@@ -337,15 +334,27 @@
                       <list>
                         <tuple>
                           <string>resource_translated_title</string>
-                          <string>Resource</string>
+                          <string>Denomination</string>
+                        </tuple>
+                        <tuple>
+                          <string>cash_status_translated_title</string>
+                          <string>State</string>
+                        </tuple>
+                        <tuple>
+                          <string>emission_letter_title</string>
+                          <string>Letter</string>
                         </tuple>
                         <tuple>
-                          <string>total_quantity</string>
-                          <string>Inventory</string>
+                          <string>variation_title</string>
+                          <string>Issuing Year</string>
+                        </tuple>
+                        <tuple>
+                          <string>quantity</string>
+                          <string>Number</string>
                         </tuple>
                         <tuple>
                           <string>total_price</string>
-                          <string>Total Price</string>
+                          <string>Amount</string>
                         </tuple>
                       </list>
                     </value>
@@ -391,12 +400,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>total_quantity</string>
-                          <string>Inventory</string>
-                        </tuple>
-                        <tuple>
-                          <string>total_price</string>
-                          <string>Total Price</string>
+                          <string>quantity</string>
+                          <string>quantity</string>
                         </tuple>
                       </list>
                     </value>
@@ -421,11 +426,11 @@
                 </item>
                 <item>
                     <key> <string>lines</string> </key>
-                    <value> <int>40</int> </value>
+                    <value> <int>15</int> </value>
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
-                    <value> <string>Folder_viewContentList</string> </value>
+                    <value> <string>Folder_viewCashCurrencyList</string> </value>
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
@@ -439,6 +444,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -447,6 +456,10 @@
                           <string>Cash Inventory Line</string>
                           <string>Cash Inventory Line</string>
                         </tuple>
+                        <tuple>
+                          <string>Cash Inventory Cell</string>
+                          <string>Cash Inventory Cell</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -476,7 +489,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>cash_inventory_line_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
@@ -487,24 +500,7 @@
                 <item>
                     <key> <string>sort_columns</string> </key>
                     <value>
-                      <list>
-                        <tuple>
-                          <string>id</string>
-                          <string>ID</string>
-                        </tuple>
-                        <tuple>
-                          <string>resource_title</string>
-                          <string>Resource</string>
-                        </tuple>
-                        <tuple>
-                          <string>total_quantity</string>
-                          <string>Inventory</string>
-                        </tuple>
-                        <tuple>
-                          <string>total_price</string>
-                          <string>Total Price</string>
-                        </tuple>
-                      </list>
+                      <list/>
                     </value>
                 </item>
                 <item>
@@ -519,7 +515,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Cash Inventory Lines</string> </value>
+                    <value> <string>Cash Details</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
@@ -547,7 +543,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>objectValues</string> </value>
+            <value> <unicode>Delivery_getMovementList</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_quantity.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_quantity.xml
new file mode 100644
index 0000000000000000000000000000000000000000..619c7090b231134a1fe74831c72c21ed496106cc
--- /dev/null
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_quantity.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>listbox_quantity</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string>figure</string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Number</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.TALESField</string>
+          <string>TALESMethod</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: int(cell.getQuantity())</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.TALESField</string>
+          <string>TALESMethod</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.getSimulationState() == \'confirmed\'</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_price.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_price.xml
index 9d7960bfe0d39877383291d13b0486805dbeff9a..6ddd7a30ed20e5a2988a4aeaeff732b32d552acc 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_price.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -126,7 +123,9 @@
                 </item>
                 <item>
                     <key> <string>default</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>description</string> </key>
@@ -162,15 +161,11 @@
                 </item>
                 <item>
                     <key> <string>input_style</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>precision</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>required</string> </key>
@@ -197,7 +192,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string>figure</string> </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -217,7 +212,7 @@
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
-                    <value> <int>0</int> </value>
+                    <value> <int>1</int> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
@@ -241,7 +236,7 @@
                 </item>
                 <item>
                     <key> <string>precision</string> </key>
-                    <value> <string></string> </value>
+                    <value> <int>0</int> </value>
                 </item>
                 <item>
                     <key> <string>required</string> </key>
@@ -249,7 +244,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Total Price</string> </value>
+                    <value> <string>Amount</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
@@ -275,26 +270,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.getPriceCurrencyValue().getQuantityPrecision()</string> </value>
+            <value> <string>python: int(cell.getPrice())</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_quantity.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_quantity.xml
index ccc261924c114e8f61b5dda39a1b90c1f03b5c80..93ef03567cf859682b6b53e4624ea91187f30d76 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_quantity.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/listbox_total_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml
index e04c141fb0d689ce05ba4102cad137319447428a..04fa32e7d862966f0942c1b02508ca0166b8d362 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -287,7 +284,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.Delivery_getVaultItemList(all=1)</string> </value>
+            <value> <string>python: here.Delivery_getVaultItemList(all=1,user_site=0,base_site=here.Baobab_getUserAssignedRootSiteList()[0],vault_type=\'site\')</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_price_currency.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_price_currency.xml
index 803b8cf6f2d34b73e15fbbfc85a8ff0b94cd1db8..749ae058b7a79b2cc8e87fddb8fe13427b94f60a 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_price_currency.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml
index fdf715ec967c86e87c1e6bd942b0e982f6d9d1e8..3e78a5cfb9bddad7126a26fc21d8a10ce4fda2d5 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_viewLineFastInputDialog.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_viewLineFastInputDialog.xml
index 283028bab5def8630f3cc056b05b2afaaf55db3e..867bbaa86a8454dbe8bff06b0ac23800b0194ec6 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_viewLineFastInputDialog.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_viewLineFastInputDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -119,15 +116,11 @@ return context.CashDelivery_generateCashDetailInputDialog( listbox
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_inventory/CashInventory_viewLineFastInputDialog</string> </value>
-        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
@@ -201,25 +194,4 @@ return context.CashDelivery_generateCashDetailInputDialog( listbox
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/InventoryLine_zGetTotal.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/InventoryLine_zGetTotal.xml
index a83bb848752a71f73d320ec5a8175d6eb569b7a2..28eab2782cb26b617a56e5c28edaea3dac6e563e 100644
--- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/InventoryLine_zGetTotal.xml
+++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/InventoryLine_zGetTotal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -192,9 +189,11 @@ AND\t\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml
index 7d2c8c7d3077cd30fc067e85fce7899fc0112e3e..42f732bd59fd036d24d36e7708dbbce2d72a34f6 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml
index 01ba35bf25f5084dde4a3822b204530dc92c3f47..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml
index d6c2d2d922f477087b83aa36eaaa28e50572f887..cd2db0fb0c7613eebbc6622ce8b6e45adb4dd062 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml
index 5129c998b7be223e728f2a8bd50ac29f7a526446..39bca970fab666795e48201f0054dc5ea7ced904 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml
index 3763e3df954ed4d9dcd0d5285c5b000528b79755..61f19d835aad719dc95cedb6501029cfdf94a7ae 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml
index 07046d72fed718dfcad3c81c6d2ef1003e3b162d..7d9ea0fae8df235f1290022d3cb37eaf4a947ade 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml
index dd344a268a61974fbcf749cadc30ef0592d6ae41..b6947a99ad9810e16709a7dff741b823fafec419 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
index 1b57b099aaab24da2a23c0877d14dcf5ab73f91f..719557507fa560c35f0be8141a024ebdc92d3835 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml
index d225c5ad9683d93f7dc340ceac80c4cb20d606c3..636dd21ecd0ad68b1ac212ed0f4108f9ca364776 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml
index 05f2a3ece824bc5cdbd8d727276771da715c8fa1..08c6214231c363145a444b6d05712cdf6b9b870b 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml
index 62edbc10c6c7ae14769992685b1a62ad5adcea73..6270841fa025e40b642fa05a91912e62301549dc 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/portal_type.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/portal_type.xml
index aaacee8edcd299fe6ab0bd3dd34716495d200659..824420045ee5a1f4070bddde2ec2f4ed22291003 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -38,7 +35,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +49,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml
index 1ff286bc78b2df9c9c408d44431332bec8a7446b..a8c1b7f62c4aa08f81156c457fd8d02cb96b2e06 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml
index 746450c3183c449b0d4487bcffd01a780edb1e16..609a885c76263f454a385fb66fa97995f5c7bdcd 100644
--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_banking_inventory/bt/provision_list b/bt5/erp5_banking_inventory/bt/provision_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_banking_inventory/bt/revision b/bt5/erp5_banking_inventory/bt/revision
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..56a6051ca2b02b04ef92d5150c9ef600403cb1de 100644
--- a/bt5/erp5_banking_inventory/bt/revision
+++ b/bt5/erp5_banking_inventory/bt/revision
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_banking_inventory/bt/short_title b/bt5/erp5_banking_inventory/bt/short_title
new file mode 100644
index 0000000000000000000000000000000000000000..4af18322e32f3dd19579c80e26e4a306ad11e049
--- /dev/null
+++ b/bt5/erp5_banking_inventory/bt/short_title
@@ -0,0 +1 @@
+None
\ No newline at end of file
diff --git a/bt5/erp5_banking_inventory/bt/template_preference_list b/bt5/erp5_banking_inventory/bt/template_preference_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391