bt5_config: Updatin erp5_core from the current status of master

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

@@ -115,8 +115,6 @@
   <item>Applied Rule</item>
  </portal_type>
  <portal_type id="Template Tool">
-  <item>Business Manager</item>
-  <item>Business Package</item>
   <item>Business Template</item>
  </portal_type>
  <portal_type id="Trash Tool">

product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -8,12 +8,6 @@
  <portal_type id="Attribute Unicity Constraint">
   <item>ConstraintType</item>
  </portal_type>
- <portal_type id="Catalog">
-  <item>Catalog</item>
- </portal_type>
- <portal_type id="Catalog Tool">
-  <item>CatalogTool</item>
- </portal_type>
  <portal_type id="Category Acquired Membership State Constraint">
   <item>ConstraintType</item>
  </portal_type>
@@ -47,13 +41,6 @@
  <portal_type id="Property Type Validity Constraint">
   <item>ConstraintType</item>
  </portal_type>
- <portal_type id="Python Script">
-  <item>CatalogFilter</item>
- </portal_type>
- <portal_type id="SQL Method">
-  <item>CatalogFilter</item>
-  <item>SQLMethod</item>
- </portal_type>
  <portal_type id="Script Constraint">
   <item>ConstraintType</item>
   <item>Predicate</item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail.xml

@@ -83,7 +83,6 @@
                         <string>my_template_constraint_id_list</string>
                         <string>my_template_local_role_list</string>
                         <string>my_template_portal_type_role_list</string>
-                        <string>my_template_object_property_list</string>
                       </list>
                     </value>
                 </item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.py

@@ -135,8 +135,8 @@ for folder in tool_list:
                                            stop_tree=stop_tree,)
 
 # Then we index ERP5 Python Scripts and ERP5 Form
-print "#### Indexing ERP5 Python Scripts, ERP5 Forms and ERP5 Reports ####"
-for _, obj in portal.portal_skins.ZopeFind(portal.portal_skins, obj_metatypes=('ERP5 Python Script', 'ERP5 Form', 'ERP5 Report'), search_sub=1):
+print "#### Indexing ERP5 Python Scripts and ERP5 Forms ####"
+for _, obj in portal.portal_skins.ZopeFind(portal.portal_skins, obj_metatypes=('ERP5 Python Script', 'ERP5 Form'), search_sub=1):
   obj.activate(tag=folder_tag,
                priority=object_priority,
                after_tag=folder_after_tag).immediateReindexObject(sql_catalog_id=sql_catalog_id)

product/ERP5/bootstrap/erp5_core/bt/template_action_path_list

@@ -113,7 +113,6 @@ Property Type Validity Constraint | view
 PyData Script | proxy_role_view
 PyData Script | repository_history_view
 PyData Script | view
-Python Script | filter_view
 Python Script | proxy_role_view
 Python Script | repository_history_view
 Python Script | run
@@ -122,10 +121,6 @@ Ram Cache | statistics
 Ram Cache | view
 Role Information | view
 Rule Tool | view
-SQL Method | advanced_view
-SQL Method | filter_view
-SQL Method | run
-SQL Method | view
 SQL Non Continuous Increasing Id Generator | view
 Script Constraint | predicate
 Script Constraint | view

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list

@@ -59,8 +59,6 @@ Property Sheet | String Attribute Match Constraint
 Property Sheet | TALES Constraint
 Simulation Movement | Applied Rule
 Simulation Tool | Applied Rule
-Template Tool | Business Manager
-Template Tool | Business Package
 Template Tool | Business Template
 Trash Tool | Trash Bin
 Types Tool | Base Type

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list

@@ -68,7 +68,6 @@ Python Script
 Ram Cache
 Role Information
 Rule Tool
-SQL Method
 SQL Non Continuous Increasing Id Generator
 Script Constraint
 Selection Tool

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list

 Attribute Blacklisted Constraint | ConstraintType
 Attribute Equality Constraint | ConstraintType
 Attribute Unicity Constraint | ConstraintType
-Catalog Tool | CatalogTool
-Catalog | Catalog
 Category Acquired Membership State Constraint | ConstraintType
 Category Existence Constraint | ConstraintType
 Category Membership Arity Constraint | ConstraintType
@@ -14,9 +12,6 @@ Document Component | SortIndex
 Extension Component | SortIndex
 Property Existence Constraint | ConstraintType
 Property Type Validity Constraint | ConstraintType
-Python Script | CatalogFilter
-SQL Method | CatalogFilter
-SQL Method | SQLMethod
 Script Constraint | ConstraintType
 Script Constraint | ConstraintType
 Script Constraint | Predicate

product/ERP5/bootstrap/erp5_core/bt/template_property_sheet_id_list

@@ -4,3 +4,4 @@ Catalog
 CatalogTool
 SQLMethod
 CatalogFilter
+ConstraintType