bt5_config: Updatin erp5_core from the current status of master

product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_categories/action_type/object_action_jio.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_folders_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Delete_objects_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>action_type/object_action_jio</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>object_action_jio</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>object_action_jio</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_categories/action_type/object_search_jio.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_folders_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Delete_objects_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>action_type/object_search_jio</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>object_search_jio</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>object_search_jio</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

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

@@ -31,13 +31,6 @@
  <portal_type id="Cache Tool">
   <item>Cache Factory</item>
  </portal_type>
- <portal_type id="Catalog">
-  <item>Python Script</item>
-  <item>SQL Method</item>
- </portal_type>
- <portal_type id="Catalog Tool">
-  <item>Catalog</item>
- </portal_type>
  <portal_type id="Category">
   <item>Category</item>
  </portal_type>
@@ -111,8 +104,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

@@ -134,16 +134,9 @@ for folder in tool_list:
                                            start_tree=start_tree,
                                            stop_tree=stop_tree,)
 
-# Then we index ERP5 Python Scripts
-print "#### Indexing ERP5 Python Scripts ####"
-for path, obj in portal.portal_skins.ZopeFind(portal.portal_skins, obj_metatypes=('ERP5 Python Script',), search_sub=1):
-  obj.activate(tag=folder_tag,
-               priority=object_priority,
-               after_tag=folder_after_tag).immediateReindexObject(sql_catalog_id=sql_catalog_id)
-
-# Then we index ERP5 SQL Methods
-print "#### Indexing ERP5 SQL Methods ####"
-for path, obj in portal.portal_skins.ZopeFind(portal.portal_skins, obj_metatypes=('ERP5 SQL Method',), search_sub=1):
+# Then we index ERP5 Python Scripts and ERP5 Form
+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

@@ -43,15 +43,6 @@ Cache Factory | statistics
 Cache Factory | view
 Cache Tool | statistics
 Cache Tool | view
-Catalog Tool | hot_reindex
-Catalog Tool | view
-Catalog | catalog_filter_view
-Catalog | clear_catalog
-Catalog | clear_reserved
-Catalog | content_view
-Catalog | export_property_content
-Catalog | property
-Catalog | update_catalog
 Category Acquired Membership State Constraint | predicate
 Category Acquired Membership State Constraint | view
 Category Existence Constraint | predicate
@@ -113,7 +104,6 @@ PyData Script | proxy_role_view
 PyData Script | repository_history_view
 PyData Script | run
 PyData Script | view
-Python Script | filter_view
 Python Script | proxy_role_view
 Python Script | repository_history_view
 Python Script | run
@@ -122,10 +112,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
@@ -171,4 +157,4 @@ portal_actions | types_tool
 portal_membership | login
 portal_membership | logout
 portal_membership | preferences
-portal_undo | undo
+portal_undo | undo
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list

@@ -12,9 +12,6 @@ Cache Factory | Cache Bag
 Cache Factory | Distributed Ram Cache
 Cache Factory | Ram Cache
 Cache Tool | Cache Factory
-Catalog Tool | Catalog
-Catalog | Python Script
-Catalog | SQL Method
 Category Tool | Base Category
 Category | Category
 Component Tool | Document Component
@@ -57,8 +54,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
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list

@@ -18,8 +18,6 @@ Business Template
 Cache Bag
 Cache Factory
 Cache Tool
-Catalog
-Catalog Tool
 Category
 Category Acquired Membership State Constraint
 Category Existence Constraint
@@ -67,7 +65,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

 ScriptConstraint
-ConstraintType
-Catalog
+ConstraintType
\ No newline at end of file
-CatalogTool
-SQLMethod
-CatalogFilter
\ No newline at end of file