Use Core Folder.

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

product/ERP5Type/Tool/BaseTool.py

@@ -30,7 +30,7 @@ from Products.CMFCore.utils import UniqueObject
 
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass, DTMLFile
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type import Permissions, _dtmldir
 
 class BaseTool (UniqueObject, Folder):

product/ERP5Type/Tool/ClassTool.py

@@ -39,7 +39,7 @@ import os
 from Products.ERP5Type import Permissions
 from Products.ERP5Type import _dtmldir
 from Products.ERP5Type.Tool.BaseTool import BaseTool
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 
 from Products.ERP5Type.Utils import readLocalPropertySheet, writeLocalPropertySheet, getLocalPropertySheetList
 from Products.ERP5Type.Utils import readLocalExtension, writeLocalExtension, getLocalExtensionList

product/ERP5Type/Utils.py

@@ -298,11 +298,17 @@ def updateGlobals(this_module, global_hook,
         if key[0:2] != '__':
           setattr(Permissions, key, getattr(permissions_module, key))
 
+  # Return core document_class list (for ERP5Type only)
+  # this was introduced to permit overriding ERP5Type Document classes
+  # which was not possible when they were define in the Document folder
+  path, core_module_id_list = getModuleIdList(product_path, 'Core')
+  for document in core_module_id_list:
+    InitializeDocument(document, document_path=path)
   # Return document_class list
   path, module_id_list = getModuleIdList(product_path, 'Document')
   for document in module_id_list:
     InitializeDocument(document, document_path=path)
-  return module_id_list
+  return module_id_list + core_module_id_list
 
 #####################################################
 # Modules Import

product/ERP5Type/XMLMatrix.py

@@ -30,7 +30,7 @@ from Globals import InitializeClass, PersistentMapping
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type.Utils import cartesianProduct
 from Products.ERP5Type.Base import TempBase
 

product/ERP5Type/XMLObject.py

@@ -33,7 +33,7 @@ from Products.ERP5Type import _dtmldir
 from Products.ERP5Type import PropertySheet, Permissions
 from Products.ERP5Type.Utils import convertToUpperCase
 
-from Document.Folder import Folder
+from Core.Folder import Folder
 from zLOG import LOG
 
 class XMLObject( Folder ):