Sync with JPS' branch (big commit)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7363 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/history_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/available_budget.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/consumed_budget.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -65,8 +68,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/contents.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/current_budget.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/initial_budget.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/constraint.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/Translate.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/print_pdf.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/content.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/detailed_report.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/milestone.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -73,8 +76,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -89,8 +95,11 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/planning.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/project_lines.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/report.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/task.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -73,8 +76,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -89,8 +95,11 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Project/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/detailed_report.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/fast_input.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/list_ui.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/orphaned.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/print_pdf.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/project_mapping.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/sort_on.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/fast_input.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/list_ui.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/print_pdf.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/sort_on.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/fast_input.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/print_pdf.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/price_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -73,8 +76,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -89,8 +95,11 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/quantity_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -73,8 +76,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -89,8 +95,11 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/list_ui.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/sort_on.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/price_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -73,8 +76,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -89,8 +95,11 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/quantity_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -73,8 +76,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -89,8 +95,11 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/icalendar_export.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/list_ui.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/planning_report.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/sort_on.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/apply_trade_condition.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/expense_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_related_purchase_packing_list.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_relation_task.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/payment_condition.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/profile_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view_discount.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/constraint.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/history.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_purchase_packing_list.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/metadata.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/payment_condition.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/print.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/view.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/ActionTemplateItem/portal_types/Task/view_discount.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,8 +74,11 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/CategoryTemplateItem/portal_categories/predecessor.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
+          <string>BaseCategory</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/CategoryTemplateItem/portal_categories/requirement.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
+          <string>BaseCategory</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/LocalRolesTemplateItem/.xml

-<local_roles_item>
- <local_roles>
-  <role id='jp'>
-   <item>Owner</item>
-  </role>
- </local_roles>
- <group_local_roles>
- </group_local_roles>
-</local_roles_item>
\ No newline at end of file

bt5/erp5_project/ModuleTemplateItem/project_module.xml

@@ -41,11 +41,11 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add Accelerated HTTP Cache Managers</name>
-   <role>Manager</role>
+   <name>AccessContentsInformation</name>
   </permission>
   <permission>
-   <name>Add Archetypes Tools</name>
+   <name>Add Accelerated HTTP Cache Managers</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add BTreeFolder2s</name>
@@ -57,6 +57,7 @@
   </permission>
   <permission>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Active Processs</name>
@@ -68,6 +69,7 @@
   </permission>
   <permission>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Core Tools</name>
@@ -75,6 +77,7 @@
   </permission>
   <permission>
    <name>Add CMF Default Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Report Tools</name>
@@ -82,6 +85,7 @@
   </permission>
   <permission>
    <name>Add CMF Setup Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Sites</name>
@@ -89,6 +93,7 @@
   </permission>
   <permission>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMFActivity Tools</name>
@@ -102,20 +107,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFTranslation Tools</name>
-  </permission>
-  <permission>
-   <name>Add COREBlog Comments</name>
-  </permission>
-  <permission>
-   <name>Add COREBlog Entries</name>
-  </permission>
-  <permission>
-   <name>Add COREBlogs</name>
-  </permission>
   <permission>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -181,9 +175,6 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5MailProxy Tools</name>
-  </permission>
   <permission>
    <name>Add ERP5Subversion Tools</name>
   </permission>
@@ -231,9 +222,6 @@
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-  </permission>
   <permission>
    <name>Add MailHost objects</name>
    <role>Manager</role>
@@ -242,9 +230,6 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MimetypesRegistry Tools</name>
-  </permission>
   <permission>
    <name>Add Page Templates</name>
    <role>Manager</role>
@@ -263,9 +248,10 @@
   </permission>
   <permission>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
   <permission>
-   <name>Add PortalTransforms Tools</name>
+   <name>Add Portal ZSyncer Tools</name>
   </permission>
   <permission>
    <name>Add Python Scripts</name>
@@ -300,15 +286,16 @@
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add Virtual Host Monsters</name>
+   <name>Add Versions</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add Vocabularies</name>
+   <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Add XMLRPC Methods</name>
+   <name>Add Vocabularies</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add Z Gadfly Database Connections</name>
@@ -325,9 +312,6 @@
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ZGDCharts</name>
-  </permission>
   <permission>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
@@ -340,6 +324,9 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
   <permission>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -368,15 +355,6 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-  </permission>
-  <permission>
-   <name>Archetypes Tests: Protected Type View</name>
-  </permission>
-  <permission>
-   <name>Archetypes Tests: Protected Type Write</name>
-  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
@@ -441,12 +419,6 @@
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change XMLRPC Methods</name>
-  </permission>
-  <permission>
-   <name>Change ZGDChart</name>
-  </permission>
   <permission>
    <name>Change ZMailIn</name>
    <role>Manager</role>
@@ -473,6 +445,7 @@
   </permission>
   <permission>
    <name>Change local roles</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Change permissions</name>
@@ -490,9 +463,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-  </permission>
   <permission>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -518,16 +488,10 @@
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-  </permission>
   <permission>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Edit ParsedXML</name>
-  </permission>
   <permission>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
@@ -577,14 +541,9 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage COREBlog</name>
-  </permission>
   <permission>
    <name>Manage Groups</name>
-  </permission>
-  <permission>
-   <name>Manage Selenium test cases</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Manage Transient Object Container</name>
@@ -610,9 +569,6 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-  </permission>
   <permission>
    <name>Manage languages</name>
    <role>Manager</role>
@@ -629,22 +585,10 @@
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-  </permission>
   <permission>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Moderate COREBlog Entries</name>
-  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
@@ -653,7 +597,6 @@
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
-   <role>Owner</role>
   </permission>
   <permission>
    <name>Open/Close Database Connection</name>
@@ -693,6 +636,7 @@
   </permission>
   <permission>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Set own password</name>
@@ -726,9 +670,6 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Use external editor</name>
-  </permission>
   <permission>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -742,9 +683,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>View DOM hierarchy</name>
-  </permission>
   <permission>
    <name>View History</name>
    <role>Assignee</role>
@@ -762,9 +700,6 @@
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>View source</name>
-  </permission>
   <permission>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
@@ -777,6 +712,15 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
+  <permission>
+   <name>ZopeProfiler: manage</name>
+  </permission>
+  <permission>
+   <name>ZopeProfiler: view</name>
+  </permission>
  </permission_list>
  <portal_type>Project Module</portal_type>
  <title>Projects</title>

bt5/erp5_project/PortalTypeRolesTemplateItem/Task%20Report.xml

-<type_roles>
-  <role id='Assignee'>
-   <property id='title'>Assigned Person</property>
-   <property id='priority'>10.0</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromArrow</property>
-   <multi_property id='base_category'>source</multi_property>
-  </role>
-  <role id='Assignor'>
-   <property id='title'>Task Assignor</property>
-   <property id='priority'>10.0</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromArrow</property>
-   <multi_property id='base_category'>destination</multi_property>
-  </role>
-</type_roles>
\ No newline at end of file

bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Cell.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5Type.ERP5Type</string>
+          <string>ERP5TypeInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>

bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Line.xml

@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
+        <tuple>
+          <string>Products.ERP5Type.ERP5Type</string>
+          <string>ERP5TypeInformation</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>