use 'Predicate' portal type rather than deprecate 'Predicate Group'

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

product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -18,7 +18,7 @@
   <item>Base Category</item>
  </portal_type>
  <portal_type id="Delivery Builder">
-  <item>Predicate Group</item>
+  <item>Predicate</item>
  </portal_type>
  <portal_type id="Delivery Tool">
   <item>Delivery Builder</item>
@@ -30,7 +30,7 @@
   <item>Base Domain</item>
  </portal_type>
  <portal_type id="Order Builder">
-  <item>Predicate Group</item>
+  <item>Predicate</item>
  </portal_type>
  <portal_type id="Order Tool">
   <item>Order Builder</item>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml

@@ -36,6 +36,10 @@
               <list/>
             </value>
         </item>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
@@ -102,6 +106,12 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml

@@ -36,6 +36,10 @@
               <list/>
             </value>
         </item>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
@@ -102,6 +106,12 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewPredicateGroupList/listbox.xml

@@ -437,8 +437,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>Predicate Group</string>
-                          <string>Predicate Group</string>
+                          <string>Predicate</string>
+                          <string>Predicate</string>
                         </tuple>
                       </list>
                     </value>
@@ -517,7 +517,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Predicate Groups</string> </value>
+                    <value> <string>Predicates</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list

@@ -4,11 +4,11 @@ Base Category | Category
 Base Domain | Domain
 Category Tool | Base Category
 Category | Category
-Delivery Builder | Predicate Group
+Delivery Builder | Predicate
 Delivery Tool | Delivery Builder
 Domain Tool | Base Domain
 Domain | Domain
-Order Builder | Predicate Group
+Order Builder | Predicate
 Order Tool | Order Builder
 Predicate | Value Predicate
 Preference Tool | Preference