From 7cd0d7d01c14bdadd160612506721bb8791f6a1b Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 15 Nov 2006 15:35:40 +0000
Subject: [PATCH] Jump category to the last XML format.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11321 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_categories/activity.xml            | 389 +++-----------
 .../portal_categories/aggregate.xml           | 112 +++-
 .../portal_categories/causality.xml           | 401 ++++-----------
 .../portal_categories/delivery.xml            | 407 ++++-----------
 .../portal_categories/destination.xml         | 480 ++++-------------
 .../destination_administration.xml            | 421 ++++-----------
 .../destination_decision.xml                  | 421 ++++-----------
 .../destination_function.xml                  | 116 ++++-
 .../portal_categories/destination_payment.xml | 421 ++++-----------
 .../portal_categories/destination_project.xml | 116 ++++-
 .../portal_categories/destination_section.xml | 483 ++++--------------
 .../portal_categories/destination_trade.xml   | 116 ++++-
 .../portal_categories/mapping.xml             | 118 ++++-
 .../portal_categories/order.xml               | 407 ++++-----------
 .../portal_categories/origin.xml              | 118 ++++-
 .../portal_categories/parent.xml              | 118 ++++-
 .../portal_categories/product_line.xml        | 409 +++------------
 .../portal_categories/quantity_unit.xml       | 415 ++++-----------
 .../portal_categories/resource.xml            | 409 ++++-----------
 .../portal_categories/size.xml                |  86 +++-
 .../portal_categories/source.xml              | 413 ++++-----------
 .../source_administration.xml                 | 421 ++++-----------
 .../portal_categories/source_decision.xml     | 421 ++++-----------
 .../portal_categories/source_function.xml     | 116 ++++-
 .../portal_categories/source_payment.xml      | 421 ++++-----------
 .../portal_categories/source_project.xml      | 116 ++++-
 .../portal_categories/source_section.xml      | 483 ++++--------------
 .../portal_categories/source_trade.xml        | 116 ++++-
 .../portal_categories/variante.xml            | 427 +++++-----------
 .../portal_categories/variation.xml           |  92 +++-
 product/ERP5/bootstrap/erp5_core/bt/revision  |   2 +-
 31 files changed, 3055 insertions(+), 5936 deletions(-)

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 703346656c..2aed79630f 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 657f3f76e4..ceaf8e7175 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 c58d00383d..b72725f87b 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 78596f8267..b535c00b52 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 0847a505e3..5cc4c07ab6 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 b62696074a..c638792335 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 4c20dd2b0d..00bec66f1d 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 77e72f6ba6..7c66bf42ca 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 d98149e50d..3ff1c7d9f4 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 fb46d1f633..7ff2040280 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 8d69cf01a3..cf80df96b3 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 4698b4e69b..da505e96e5 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 22a1399e35..5a337041ae 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 c3327f1d9a..813d0ab93c 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 553333be0e..16b136dcfc 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 4d694b761a..952fb09b1c 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 ae0550a4b3..2f7699ee0c 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 bd24be90e2..f096f8e2ba 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 577f8dc337..57b9ce8f40 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 35bc6b3c06..419bde277a 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 8c5f50daa2..874b191e18 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 c91d41dd5c..475eb366eb 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 d0e2185431..968a7037d1 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 2784dba5ad..4b5a5e31ee 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 5bab61ff22..c6ce02320d 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 7749659866..df74a5ae92 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 79ebe3a237..96e29adc68 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 2ae6c6b50b..da4796f01b 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 2d003659f6..eb19af5a47 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 69c9cab052..e4e0242e82 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 3968aef87f..89a16a7ddc 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
-- 
2.30.9