erp5_catalog: Move manage_option before declaring property sheets

product/ERP5Catalog/CatalogTool.py

@@ -321,6 +321,7 @@ class CatalogTool (ZCatalog, CMFCoreCatalogTool, BaseTool):
     default_count_limit = 1
 
     manage_options = ({ 'label' : 'Overview', 'action' : 'manage_overview' },
+                      { 'label' : 'Catalog', 'action' : 'manage_catalogView'},
                      ) + Folder.manage_options
 
     property_sheets = ( PropertySheet.Base
@@ -329,16 +330,6 @@ class CatalogTool (ZCatalog, CMFCoreCatalogTool, BaseTool):
                     , PropertySheet.CatalogTool
                     )
 
-    _properties = ZCatalog._properties + (
-                                          { 'id'      : 'default_erp5_catalog_id',
-                                            'description' : 'Default ERP5 Catalog Id',
-                                            'type'    : 'selection',
-                                            'select_variable' : 'getERP5CatalogIdList',
-                                            'mode'    : 'w' },
-                                          )
-
-    default_erp5_catalog_id = None
-
     # Use reindexObject method from BaseTool class and declare it public
     reindexObject = BaseTool.reindexObject
     security.declarePublic('reindexObject')

product/ERP5Catalog/ERP5Catalog.py

@@ -57,6 +57,10 @@ class ERP5Catalog(Folder, Catalog):
   icon = None
   security = ClassSecurityInfo()
 
+  manage_options = ( Folder.manage_options+
+                     OFS.History.Historical.manage_options
+                   )
+
   # Declarative properties
   property_sheets = ( PropertySheet.Base
                     , PropertySheet.SimpleItem
@@ -69,10 +73,6 @@ class ERP5Catalog(Folder, Catalog):
   _setPropValue = Catalog._setPropValue
   getProperty = Catalog.getProperty
 
-  manage_options = ( Folder.manage_options+
-                     OFS.History.Historical.manage_options
-                    )
-
   # Declarative Constructors
   constructors = (manage_addERP5CatalogForm, manage_addERP5Catalog,)