diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml
index 703346656cc33f638b2d0a7b5d44b84b79619897..2aed79630ffe812960e8acce93183e4702c72027 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -372,23 +69,27 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -399,10 +100,74 @@
             <key> <string>id</string> </key>
             <value> <string>activity</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -415,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/aggregate.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/aggregate.xml
index 657f3f76e4ac8c6db2a379da15c55379973456dc..ceaf8e7175c4cffe0f60dd4b4561536ee11be9d0 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/aggregate.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/aggregate.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -62,20 +84,94 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>aggregate</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -88,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/causality.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/causality.xml
index c58d00383d5eb6bc564b2a88fc2b4a70ce2fd827..b72725f87b0343cf4e8a882244f4fcbfc585b28a 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/causality.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/causality.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -383,6 +74,18 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -397,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>causality</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -407,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/delivery.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/delivery.xml
index 78596f826750208565175f0e9dfa41373832bc66..b535c00b5236a6f81fa53532637a43d981c92139 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/delivery.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/delivery.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -377,6 +68,24 @@
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -391,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>delivery</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -401,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml
index 0847a505e30f71566ab4d865e7f8361f50069fb6..5cc4c07ab6b180ee0955b3c52f8a1208e93e1f32 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -359,17 +50,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple>
-                <string>delivery</string>
-                <string>causality</string>
-                <string>order</string>
-                <string>parent</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -379,103 +59,119 @@
             <value> <int>1</int> </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <tuple>
-<string></string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList() + portal.getPortalSupplyPathTypeList())</string> </value>
         </item>
-        <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
-            <value>
-              <tuple>
-                <string>Delivery Line</string>
-                <string>Purchase Order Line</string>
-                <string>Movement PF Line</string>
-                <string>Production Order</string>
-                <string>Inventory MP Line</string>
-                <string>Production Packing List Line</string>
-                <string>Sales Invoice</string>
-                <string>Production Packing List</string>
-                <string>Production Order Line</string>
-                <string>Inventory PF</string>
-                <string>Purchase Invoice Transaction Line</string>
-                <string>Sale Order Line</string>
-                <string>Sale Invoice</string>
-                <string>Purchase Packing List</string>
-                <string>Sale Packing List</string>
-                <string>Sale Invoice Transaction Line</string>
-                <string>Accounting Transaction</string>
-                <string>Inventory MP</string>
-                <string>Delivery</string>
-                <string>Delivery Cell</string>
-                <string>Production Report Component</string>
-                <string>Sales Packing List Line</string>
-                <string>Production Report</string>
-                <string>Purchase Packing List Line</string>
-                <string>Production Report Cell</string>
-                <string>Piece Tissu</string>
-                <string>Production Report Operation</string>
-                <string>Transaction</string>
-                <string>Inventory Line</string>
-                <string>Purchase Invoice Transaction</string>
-                <string>Sale Order</string>
-                <string>Purchase Order</string>
-                <string>Project</string>
-                <string>Inventory PF Line</string>
-                <string>Movement MP Line</string>
-                <string>Sale Invoice Transaction</string>
-                <string>Order</string>
-                <string>Sample Order Line</string>
-                <string>Invoice Cell</string>
-                <string>Accounting Transaction Line</string>
-                <string>Invoice Line</string>
-                <string>Inventory Cell</string>
-                <string>Packing List</string>
-                <string>Movement PF</string>
-                <string>Container Line</string>
-                <string>Samples Order</string>
-                <string>Invoice</string>
-                <string>Container Cell</string>
-                <string>Sales Packing List</string>
-                <string>Sales Order</string>
-                <string>Movement MP</string>
-                <string>Sales Order Line</string>
-                <string>Pay Sheet Line</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>destination</string> </value>
@@ -486,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml
index b62696074a67e3114c840b9e099741c8635dd9cf..c638792335a2dc7e1ce426ce20fcaf223885a3eb 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -368,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_administration</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -392,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml
index 4c20dd2b0df731e5fb5c57541f792f5c1606be1b..00bec66f1d9118fcf5e59fa9f0994b91010fa3c1 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -368,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_decision</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -392,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml
index 77e72f6ba6630ff7a8704e15d7ca9f161460eb15..7c66bf42ca07b14dc235f037d6ca331f07784c3b 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -52,10 +50,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -64,20 +80,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_function</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Destination Function</string> </value>
@@ -88,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml
index d98149e50d7d750f2757ade894b6ed7a7cad1028..3ff1c7d9f4a58c350f2cac94079abcf1e3315a79 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -368,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_payment</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -392,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml
index fb46d1f6332aa551a6cad10143e1de4fa507269a..7ff20402809c355055374e73d0ca5c9573806de5 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -52,10 +50,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -65,20 +81,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_project</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>destination_project</string> </value>
@@ -89,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml
index 8d69cf01a37482d98794e5916e62e028dbd5fb2b..cf80df96b3898b5f56ed0a75a7c2933ede403f24 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -359,16 +50,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple>
-                <string>delivery</string>
-                <string>order</string>
-                <string>parent</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -378,11 +59,9 @@
             <value> <int>1</int> </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <tuple>
-<string></string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -390,91 +69,109 @@
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList() + portal.getPortalSupplyPathTypeList())</string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Line</string>
-                <string>Sales Invoice</string>
-                <string>Purchase Order Line</string>
-                <string>Movement PF Line</string>
-                <string>Pay Sheet Transaction</string>
-                <string>Production Order</string>
-                <string>Inventory MP Line</string>
-                <string>Production Packing List Line</string>
-                <string>Pay Sheet Line</string>
-                <string>Production Packing List</string>
-                <string>Production Order Line</string>
-                <string>Inventory PF</string>
-                <string>Purchase Invoice Transaction Line</string>
-                <string>Sale Order Line</string>
-                <string>Sale Invoice</string>
-                <string>Purchase Packing List</string>
-                <string>Sale Packing List</string>
-                <string>Sale Invoice Transaction Line</string>
-                <string>Accounting Transaction</string>
-                <string>Inventory MP</string>
-                <string>Delivery</string>
-                <string>Delivery Cell</string>
-                <string>Production Report Component</string>
-                <string>Sales Packing List Line</string>
-                <string>Production Report</string>
-                <string>Purchase Packing List Line</string>
-                <string>Production Report Cell</string>
-                <string>Piece Tissu</string>
-                <string>Pay Sheet Cell</string>
-                <string>Production Report Operation</string>
-                <string>Transaction</string>
-                <string>Inventory Line</string>
-                <string>Packing Order Line</string>
-                <string>Purchase Invoice Transaction</string>
-                <string>Sale Order</string>
-                <string>Purchase Order</string>
-                <string>Project</string>
-                <string>Inventory PF Line</string>
-                <string>Movement MP Line</string>
-                <string>Sale Invoice Transaction</string>
-                <string>Order</string>
-                <string>Packing Order</string>
-                <string>Sample Order Line</string>
-                <string>Invoice Cell</string>
-                <string>Accounting Transaction Line</string>
-                <string>Invoice Line</string>
-                <string>Inventory Cell</string>
-                <string>Packing List</string>
-                <string>Movement PF</string>
-                <string>Container Line</string>
-                <string>Samples Order</string>
-                <string>Invoice</string>
-                <string>Container Cell</string>
-                <string>Sales Packing List</string>
-                <string>Sales Order</string>
-                <string>Movement MP</string>
-                <string>Sales Order Line</string>
-                <string>Payment Transaction</string>
-                <string>Balance Transaction</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_section</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>destination_section</string> </value>
@@ -485,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml
index 4698b4e69b10e9adf083689f9e38cb22787e5b09..da505e96e588e860a89ce7c71dda2cbc70dde034 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -52,10 +50,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -65,20 +81,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>destination_trade</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>destination_trade</string> </value>
@@ -89,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/mapping.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/mapping.xml
index 22a1399e3586dac1c48fe38a25c0b5ecd77ea820..5a337041aeae5925437a0186093317750a36a594 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/mapping.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/mapping.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,20 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>mapping</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Mapping</string> </value>
@@ -78,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/order.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/order.xml
index c3327f1d9ac031389aff3edef29da5571d3e62af..813d0ab93c25c31e018203c73a1c61c41c46a867 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/order.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/order.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -377,6 +68,24 @@
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -391,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>order</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -401,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/origin.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/origin.xml
index 553333be0ed3e820f60cd90004da84a05d535930..16b136dcfc17d2d40bdec3f33f64a4ac78262854 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/origin.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/origin.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,20 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>origin</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -80,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/parent.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/parent.xml
index 4d694b761a928a3c7e6ed323f83179a18f087083..952fb09b1c1a14b11e24f55679af8aa1b4c0f889 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/parent.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/parent.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,20 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>parent</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -80,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/product_line.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/product_line.xml
index ae0550a4b3c601ffca0db8dd35e38f8456672789..2f7699ee0ce529637d8c6fc338756b65a06cee2b 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/product_line.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/product_line.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -352,18 +49,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_base_category_list_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -381,68 +66,112 @@
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: [\'Career\'] + list(portal.getPortalResourceTypeList()) +  list(portal.getPortalMovementTypeList())</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list_list</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: [\'Career\'] + list(portal.getPortalResourceTypeList()) +  list(portal.getPortalMovementTypeList())</string> </value>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
+            <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list_list</string> </key>
-            <value> <string></string> </value>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>id</string> </key>
+            <value> <string>product_line</string> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>id_generator</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>id_group</string> </key>
             <value>
-              <tuple/>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list</string> </key>
+            <key> <string>membership_criterion_base_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list_list</string> </key>
+            <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>id</string> </key>
-            <value> <string>product_line</string> </value>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -454,6 +183,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml
index bd24be90e2205ca4a69876c6a37272b9735ff687..f096f8e2bad0530d3aeca118947ed9ad107c7283 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -362,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalResourceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>quantity_unit</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -386,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml
index 577f8dc337345ea63fcb4b924cd6d5eab2d2555a..57b9ce8f40c90fe854f9159608a93556a4f53e5e 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -367,30 +58,120 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList() + portal.getPortalSupplyPathTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>resource</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -403,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml
index 35bc6b3c063d7e8118949fa6a27b588a8a284fef..419bde277a0ca48092cf09a829ba510cc809c535 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -78,6 +72,12 @@
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>category_type</string> </key>
             <value>
@@ -88,11 +88,15 @@
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -103,6 +107,12 @@
             <key> <string>id</string> </key>
             <value> <string>size</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -111,6 +121,58 @@
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Size</string> </value>
@@ -121,6 +183,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml
index 8c5f50daa2a9667ee694635357148af571e5be3e..874b191e18e1d454dee958f1ef5f0d7610dfc176 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -367,32 +58,120 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList() + portal.getPortalSupplyPathTypeList())</string> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -405,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml
index c91d41dd5c5a69eec6b134582f67ea7dc64d1799..475eb366ebb833f042113378336213e352bf1344 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -368,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_administration</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -392,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml
index d0e21854310967db599f30511c30b18103b9840d..968a7037d13f97d909724252a1207a6a83fe8864 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -368,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_decision</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -392,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml
index 2784dba5ad7cdcadec1da42e5de88e587ef212a7..4b5a5e31ee084e6e6b7e3de776ba46842b7814ab 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -52,10 +50,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -64,20 +80,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_function</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Source Function</string> </value>
@@ -88,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml
index 5bab61ff227d510ab91ca54017c897e275996062..c6ce02320dd0d2e590706f65430a253de3b3683c 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -368,23 +59,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_payment</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -392,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml
index 7749659866286d7484b3945210029b8c752fe675..df74a5ae925b54958ba8dd91bea0353d5901403a 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -52,10 +50,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -65,20 +81,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_project</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>source_project</string> </value>
@@ -89,6 +185,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml
index 79ebe3a2378710871bcd236b4cb39eae5eccd3cc..96e29adc688ad644b7414e1bc920cd6b3b499fb9 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -359,16 +50,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple>
-                <string>delivery</string>
-                <string>order</string>
-                <string>parent</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -378,11 +59,9 @@
             <value> <int>1</int> </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_object_id</string> </key>
             <value>
-              <tuple>
-<string></string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -390,91 +69,109 @@
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList() + portal.getPortalSupplyPathTypeList())</string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Line</string>
-                <string>Sales Invoice</string>
-                <string>Purchase Order Line</string>
-                <string>Movement PF Line</string>
-                <string>Pay Sheet Transaction</string>
-                <string>Production Order</string>
-                <string>Inventory MP Line</string>
-                <string>Production Packing List Line</string>
-                <string>Pay Sheet Line</string>
-                <string>Production Packing List</string>
-                <string>Production Order Line</string>
-                <string>Inventory PF</string>
-                <string>Purchase Invoice Transaction Line</string>
-                <string>Sale Order Line</string>
-                <string>Sale Invoice</string>
-                <string>Purchase Packing List</string>
-                <string>Sale Packing List</string>
-                <string>Sale Invoice Transaction Line</string>
-                <string>Accounting Transaction</string>
-                <string>Inventory MP</string>
-                <string>Delivery</string>
-                <string>Delivery Cell</string>
-                <string>Production Report Component</string>
-                <string>Sales Packing List Line</string>
-                <string>Production Report</string>
-                <string>Purchase Packing List Line</string>
-                <string>Production Report Cell</string>
-                <string>Piece Tissu</string>
-                <string>Pay Sheet Cell</string>
-                <string>Production Report Operation</string>
-                <string>Transaction</string>
-                <string>Inventory Line</string>
-                <string>Packing Order Line</string>
-                <string>Purchase Invoice Transaction</string>
-                <string>Sale Order</string>
-                <string>Purchase Order</string>
-                <string>Project</string>
-                <string>Inventory PF Line</string>
-                <string>Movement MP Line</string>
-                <string>Sale Invoice Transaction</string>
-                <string>Order</string>
-                <string>Packing Order</string>
-                <string>Sample Order Line</string>
-                <string>Invoice Cell</string>
-                <string>Accounting Transaction Line</string>
-                <string>Invoice Line</string>
-                <string>Inventory Cell</string>
-                <string>Packing List</string>
-                <string>Movement PF</string>
-                <string>Container Line</string>
-                <string>Samples Order</string>
-                <string>Invoice</string>
-                <string>Container Cell</string>
-                <string>Sales Packing List</string>
-                <string>Sales Order</string>
-                <string>Movement MP</string>
-                <string>Sales Order Line</string>
-                <string>Payment Transaction</string>
-                <string>Balance Transaction</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_section</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>source_section</string> </value>
@@ -485,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml
index 2ae6c6b50bc0d9410ace037409d8ffd91c32493e..da4796f01b2fdc698de1b3bc5a39860977ea25df 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -52,10 +50,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -66,20 +82,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>source_trade</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>source_trade</string> </value>
@@ -90,6 +186,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variante.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variante.xml
index 2d003659f6daa05bbbcd2b5d6865a98002a7efda..eb19af5a479ed1b188bda29f27368a4a4d489c5c 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variante.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variante.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </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>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <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>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -367,17 +58,125 @@
             <key> <string>acquisition_mask_value</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variante</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -385,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variation.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variation.xml
index 69c9cab052939ecc5d191aa1a8a110332dd281c2..e4e0242e824ca646608b4b7fd079e7f2e672fda2 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variation.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/variation.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -80,11 +74,27 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -95,6 +105,12 @@
             <key> <string>id</string> </key>
             <value> <string>variation</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -103,6 +119,58 @@
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -115,6 +183,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 3968aef87f28b2029667d95cd6e22f31b0bd2e50..89a16a7ddc3b772d81302efaab91722efa3e1429 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-170
\ No newline at end of file
+172
\ No newline at end of file