* constraint_portal_type for ZODB CategoryExistenceConstraint and

  CategoryMembershipArityConstraint should have always been a string
  to allow defining a TALES Expression as already used in filesystem
  Property Sheets.

* Add use_acquisition attribute to allow merging CategoryAcquiredExistenceConstraint
  into CategoryExistenceConstraint, and CategoryAcquiredMembershipArityConstraint into
  CategoryMembershipArityConstraint.



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

product/ERP5PropertySheetLegacy/PropertySheet/CategoryExistenceConstraint.py

@@ -35,10 +35,14 @@ class CategoryExistenceConstraint:
             'type': 'lines',
             'description' : 'Categories to check the existence for',
             'default': () },
+        # TALES Expression
         {   'id': 'constraint_portal_type',
-            'type': 'lines',
+            'type': 'string',
             'description' : 'Portal types',
-            'default': () },
+            'default': 'python: ()' },
+        {   'id' : 'use_acquisition',
+            'type': 'boolean',
+            'description': 'Use acquisition when checking categories' },
         {   'id': 'message_category_not_set',
             'type': 'string',
             'description' : 'Error message when the category is not defined',

product/ERP5PropertySheetLegacy/PropertySheet/CategoryMembershipArityConstraint.py

@@ -37,14 +37,18 @@ class CategoryMembershipArityConstraint:
         {   'id': 'max_arity',
             'type': 'int',
             'description' : 'Maximum arity' },
+        # TALES Expression
         {   'id': 'constraint_portal_type',
-            'type': 'lines',
+            'type': 'string',
             'description' : 'Portal types',
-            'default': () },
+            'default': 'python: ()' },
         {   'id': 'constraint_base_category',
             'type': 'lines',
             'description' : 'Base categories',
             'default': () },
+        {   'id' : 'use_acquisition',
+            'type': 'boolean',
+            'description': 'Use acquisition when checking categories' },
         {   'id': 'message_arity_too_small',
             'type': 'string',
             'description' : 'Error message when the arity for the relation '\