bt5_config: Update _bootstrap for portal_types and portal_property_sheets to...

bt5_config: Update _bootstrap for portal_types and portal_property_sheets to use bootstrap_bm instead of Business Template(s)

product/ERP5Type/Tool/PropertySheetTool.py

@@ -62,17 +62,17 @@ class PropertySheetTool(BaseTool):
   def _bootstrap(self):
     bt_name = 'erp5_property_sheets'
     from Products.ERP5.ERP5Site import ERP5Generator
-    ERP5Generator.bootstrap(self, bt_name, 'PropertySheetTemplateItem', (
-      'BaseType',
-      'BusinessTemplate',
-      'Folder',
-      'SimpleItem',
-      'Version',
-      'Comment',
+    ERP5Generator.bootstrap_bm(self, bt_name, (
+      'portal_property_sheets/BaseType',
+      'portal_property_sheets/BusinessTemplate',
+      'portal_property_sheets/Folder',
+      'portal_property_sheets/SimpleItem',
+      'portal_property_sheets/Version',
+      'portal_property_sheets/Comment',
       # the following ones are required to upgrade an existing site
-      'Reference',
-      'BaseCategory',
-      'SQLIdGenerator',
+      'portal_property_sheets/Reference',
+      'portal_property_sheets/BaseCategory',
+      'portal_property_sheets/SQLIdGenerator',
     ))
     def install():
       from ZPublisher.BaseRequest import RequestContainer

product/ERP5Type/Tool/TypesTool.py

@@ -124,15 +124,6 @@ class TypesTool(TypeProvider):
 
   def _bootstrap(self):
     from Products.ERP5.ERP5Site import ERP5Generator
-    ERP5Generator.bootstrap(self, 'erp5_core', 'PortalTypeTemplateItem', (
-      'Business Template',
-      'Standard Property',
-      'Acquired Property',
-      # the following ones are required to upgrade an existing site
-      'Category Property',
-      # the following is needed to bootstrap Catalog Tool and default catalog
-      'Catalog Tool',
-    ))
     ERP5Generator.bootstrap_allow_type(self, 'Catalog Tool')
     # Bootstrap Business Manager as it'll be needed while installation
     ERP5Generator.bootstrap(self, 'erp5_business_package', 'PortalTypeTemplateItem', (
@@ -140,6 +131,13 @@ class TypesTool(TypeProvider):
       'Business Item',
       'Business Property Item'
     ))
+    ERP5Generator.bootstrap_bm(self, 'erp5_core', (
+      'portal_types/Business Template',
+      'portal_types/Standard Property',
+      'portal_types/Acquired Property',
+      # the following ones are required to upgrade an existing site
+      'portal_types/Category Property',
+    ))
 
   def listContentTypes(self, container=None):
     """List content types from all providers