From f0a4b25a760b36ddd8e100b39b7f579273365cb7 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Wed, 3 Jan 2007 01:48:05 +0000
Subject: [PATCH] Removed dependency to ancient Core. Left commented class def
 to remind to create Interfaces to replace ancient Core classes.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11848 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5/Document/Immobilisation.py         | 2 +-
 product/ERP5/Document/ImmobilisationCell.py     | 2 +-
 product/ERP5/Document/ImmobilisationLine.py     | 2 +-
 product/ERP5/Document/ImmobilisationMovement.py | 2 +-
 product/ERP5/Document/MetaNode.py               | 4 ++--
 product/ERP5/Document/MetaResource.py           | 5 +++--
 product/ERP5/Document/Movement.py               | 2 +-
 product/ERP5/Document/Organisation.py           | 6 ++++--
 product/ERP5/Document/Path.py                   | 2 +-
 product/ERP5/Document/Person.py                 | 5 +++--
 product/ERP5/Document/Predicate.py              | 2 +-
 product/ERP5/Document/Resource.py               | 5 +++--
 product/ERP5/Document/Variation.py              | 5 +++--
 13 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/product/ERP5/Document/Immobilisation.py b/product/ERP5/Document/Immobilisation.py
index 21bc08cadd..5947e15778 100644
--- a/product/ERP5/Document/Immobilisation.py
+++ b/product/ERP5/Document/Immobilisation.py
@@ -30,7 +30,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core import MetaNode, MetaResource
+#from Products.ERP5.Core import MetaNode, MetaResource
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
diff --git a/product/ERP5/Document/ImmobilisationCell.py b/product/ERP5/Document/ImmobilisationCell.py
index f3848b5af7..154c872004 100644
--- a/product/ERP5/Document/ImmobilisationCell.py
+++ b/product/ERP5/Document/ImmobilisationCell.py
@@ -30,7 +30,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core import MetaNode, MetaResource
+#from Products.ERP5.Core import MetaNode, MetaResource
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
diff --git a/product/ERP5/Document/ImmobilisationLine.py b/product/ERP5/Document/ImmobilisationLine.py
index 98960fb718..b54dd52fd0 100644
--- a/product/ERP5/Document/ImmobilisationLine.py
+++ b/product/ERP5/Document/ImmobilisationLine.py
@@ -30,7 +30,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core import MetaNode, MetaResource
+#from Products.ERP5.Core import MetaNode, MetaResource
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
diff --git a/product/ERP5/Document/ImmobilisationMovement.py b/product/ERP5/Document/ImmobilisationMovement.py
index 8b8116a455..57eb4f046e 100644
--- a/product/ERP5/Document/ImmobilisationMovement.py
+++ b/product/ERP5/Document/ImmobilisationMovement.py
@@ -30,7 +30,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core import MetaNode, MetaResource
+#from Products.ERP5.Core import MetaNode, MetaResource
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
diff --git a/product/ERP5/Document/MetaNode.py b/product/ERP5/Document/MetaNode.py
index cbb9ea5114..3bec60ea13 100644
--- a/product/ERP5/Document/MetaNode.py
+++ b/product/ERP5/Document/MetaNode.py
@@ -29,12 +29,12 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core.MetaNode import MetaNode as CoreMetaNode
+#from Products.ERP5.Core.MetaNode import MetaNode as CoreMetaNode
 from Products.ERP5.Document.Organisation import Organisation as Node
 #from Node import Node
 
 #class MetaNode(Node, CoreMetaNode):
-class MetaNode(Node, CoreMetaNode):
+class MetaNode(Node):
     """
       A Node
     """
diff --git a/product/ERP5/Document/MetaResource.py b/product/ERP5/Document/MetaResource.py
index 6c6dc22a47..d7c6eb80a5 100644
--- a/product/ERP5/Document/MetaResource.py
+++ b/product/ERP5/Document/MetaResource.py
@@ -29,10 +29,11 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core.MetaResource import MetaResource as CoreMetaResource
+#from Products.ERP5.Core.MetaResource import MetaResource as CoreMetaResource
 from Products.ERP5.Document.Resource import Resource
 
-class MetaResource(Resource, CoreMetaResource):
+#class MetaResource(Resource, CoreMetaResource):
+class MetaResource(Resource):
     """
       A Resource
     """
diff --git a/product/ERP5/Document/Movement.py b/product/ERP5/Document/Movement.py
index b09605bee2..bde6775f97 100644
--- a/product/ERP5/Document/Movement.py
+++ b/product/ERP5/Document/Movement.py
@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.Base import Base
 
-from Products.ERP5.Core import MetaNode, MetaResource
+#from Products.ERP5.Core import MetaNode, MetaResource
 
 from Products.ERP5Type.XMLObject import XMLObject
 
diff --git a/product/ERP5/Document/Organisation.py b/product/ERP5/Document/Organisation.py
index 3301e9a1a9..9c0f928b39 100644
--- a/product/ERP5/Document/Organisation.py
+++ b/product/ERP5/Document/Organisation.py
@@ -31,9 +31,11 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.XMLObject import XMLObject
 
-from Products.ERP5.Core.MetaNode import MetaNode
+#from Products.ERP5.Core.MetaNode import MetaNode
+#from Products.ERP5.Document.MetaNode import MetaNode
 
-class Organisation(MetaNode, XMLObject):
+#class Organisation(MetaNode, XMLObject):
+class Organisation(XMLObject):
     """
       An Organisation object holds the information about
       an organisation (ex. a division in a company, a company,
diff --git a/product/ERP5/Document/Path.py b/product/ERP5/Document/Path.py
index 422808ae3c..2f5bb4221a 100644
--- a/product/ERP5/Document/Path.py
+++ b/product/ERP5/Document/Path.py
@@ -30,7 +30,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5.Core import MetaNode, MetaResource
+#from Products.ERP5.Core import MetaNode, MetaResource
 
 from Products.ERP5.Document.MappedValue import MappedValue
 
diff --git a/product/ERP5/Document/Person.py b/product/ERP5/Document/Person.py
index 8d393989e7..0acc467c00 100644
--- a/product/ERP5/Document/Person.py
+++ b/product/ERP5/Document/Person.py
@@ -30,7 +30,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
 
-from Products.ERP5.Core.Node import Node
+#from Products.ERP5.Core.Node import Node
 
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.Utils import assertAttributePortalType
@@ -48,7 +48,8 @@ try :
 except ImportError:
   pw_encrypt = lambda pw:pw
 
-class Person(Node, XMLObject):
+#class Person(Node, XMLObject):
+class Person(XMLObject):
     """
       An Person object holds the information about
       an person (ex. you, me, someone in the company,
diff --git a/product/ERP5/Document/Predicate.py b/product/ERP5/Document/Predicate.py
index b2e2b7b2a5..fe84041dac 100644
--- a/product/ERP5/Document/Predicate.py
+++ b/product/ERP5/Document/Predicate.py
@@ -33,7 +33,7 @@ from Acquisition import aq_base, aq_inner
 from Products.CMFCore.utils import getToolByName
 
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type.Document import newTempBase
 from Products.ERP5Type.Utils import convertToUpperCase
 
diff --git a/product/ERP5/Document/Resource.py b/product/ERP5/Document/Resource.py
index b9eed65a78..a19ebfb267 100644
--- a/product/ERP5/Document/Resource.py
+++ b/product/ERP5/Document/Resource.py
@@ -38,14 +38,15 @@ from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.Base import Base
 
 from Products.ERP5.Variated import Variated
-from Products.ERP5.Core.Resource import Resource as CoreResource
+#from Products.ERP5.Core.Resource import Resource as CoreResource
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 from Products.CMFCategory.Renderer import Renderer
 from Products.CMFCore.utils import getToolByName
 
 from zLOG import LOG, WARNING
 
-class Resource(XMLMatrix, CoreResource, Variated):
+#class Resource(XMLMatrix, CoreResource, Variated):
+class Resource(XMLMatrix, Variated):
     """
       A Resource
     """
diff --git a/product/ERP5/Document/Variation.py b/product/ERP5/Document/Variation.py
index 62ee7fe612..44a1601267 100644
--- a/product/ERP5/Document/Variation.py
+++ b/product/ERP5/Document/Variation.py
@@ -31,9 +31,10 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.XMLObject import XMLObject
 
-from Products.ERP5.Core import Variation
+#from Products.ERP5.Core import Variation
 
-class Variation(XMLObject, Variation):
+#class Variation(XMLObject, Variation):
+class Variation(XMLObject):
     """
       A Variation
     """
-- 
2.30.9