interfaces directory now follows zope naming convention.

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

interfaces directory now follows zope naming convention.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27285 20353a03-c40f-0410-a6d1-a30d3c3de9de
19d1cfd3 · Kazuhiko Shiozaki · 9016e526 · 19d1cfd3 · 19d1cfd3 · 19d1cfd3
Commit 19d1cfd3 authored Jun 01, 2009 by Kazuhiko Shiozaki
167 changed files
--- a/product/ERP5/Document/Account.py
+++ b/product/ERP5/Document/Account.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 #from Products.ERP5.Core.MetaNode import MetaNode

--- a/product/ERP5/Document/AccountingRuleCell.py
+++ b/product/ERP5/Document/AccountingRuleCell.py
@@ -29,7 +29,7 @@
 #from Globals import InitializeClass, PersistentMapping
 #from Products.CMFCore.utils import getToolByName
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5.Document.Invoice import Invoice

--- a/product/ERP5/Document/AccountingTransaction.py
+++ b/product/ERP5/Document/AccountingTransaction.py
@@ -28,7 +28,7 @@

 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.CMFCore.utils import getToolByName

 from Products.ERP5.Document.Delivery import Delivery

--- a/product/ERP5/Document/Acknowledgement.py
+++ b/product/ERP5/Document/Acknowledgement.py
@@ -27,7 +27,7 @@
 #
 ##############################################################################
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.EmailDocument import EmailDocumentProxyMixin
 from Products.ERP5.Document.Event import Event

--- a/product/ERP5/Document/AgentPrivilege.py
+++ b/product/ERP5/Document/AgentPrivilege.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject



--- a/product/ERP5/Document/AmortisationRule.py
+++ b/product/ERP5/Document/AmortisationRule.py
@@ -33,7 +33,7 @@ from string import lower, capitalize

 from Products.ERP5Type.DateUtils import millis, centis, getClosestDate, addToDate
 from Products.ERP5Type.DateUtils import getDecimalNumberOfYearsBetween
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5.Document.ImmobilisationMovement import NO_CHANGE_METHOD
@@ -57,8 +57,8 @@ class AmortisationRule(Rule):
    security = ClassSecurityInfo()
    security.declareObjectProtected(Permissions.AccessContentsInformation)
    
-    __implements__ = ( Interface.Predicate,
-                       Interface.Rule )
+    __implements__ = ( interfaces.IPredicate,
+                       interfaces.IRule )

    # Default Properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Amount.py
+++ b/product/ERP5/Document/Amount.py
@@ -31,7 +31,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from Products.ERP5.Variated import Variated
 from Products.ERP5.VariationValue import VariationValue
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base
 from Products.ERP5Type.Base import TempBase
 from Products.CMFCategory.Renderer import Renderer
@@ -61,7 +61,7 @@ class Amount(Base, Variated):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = (Interface.Variated)
+  __implements__ = (interfaces.IVariated)

  property_sheets = ( PropertySheet.Base
                    , PropertySheet.SimpleItem

--- a/product/ERP5/Document/AmountFilter.py
+++ b/product/ERP5/Document/AmountFilter.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Amount import Amount
 from Products.ERP5.Document.MappedValue import MappedValue

@@ -64,7 +64,7 @@ class AmountFilter(MappedValue, Amount):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/AnnotationLine.py
+++ b/product/ERP5/Document/AnnotationLine.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.PaySheetLine import PaySheetLine

@@ -53,7 +53,7 @@ class AnnotationLine(PaySheetLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/AppliedRule.py
+++ b/product/ERP5/Document/AppliedRule.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.PsycoWrapper import psyco
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable

--- a/product/ERP5/Document/Assignment.py
+++ b/product/ERP5/Document/Assignment.py
@@ -28,7 +28,7 @@

 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Path import Path


--- a/product/ERP5/Document/AssortedResource.py
+++ b/product/ERP5/Document/AssortedResource.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.Utils import cartesianProduct
@@ -131,7 +131,7 @@ class AssortedResource(TransformedResource):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Local property sheet
    _properties = (

--- a/product/ERP5/Document/BalanceTransaction.py
+++ b/product/ERP5/Document/BalanceTransaction.py
@@ -29,7 +29,7 @@
 from UserDict import UserDict

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Inventory import Inventory
 from Products.ERP5.Document.AccountingTransaction import AccountingTransaction

@@ -88,7 +88,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
  isRADContent = 1
  isDelivery = 1
    
-  #__implements__ = ( Interface.Inventory, )
+  #__implements__ = ( interfaces.Inventory, )

  # Declarative security
  security = ClassSecurityInfo()

--- a/product/ERP5/Document/BalanceTransactionLine.py
+++ b/product/ERP5/Document/BalanceTransactionLine.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.AccountingTransactionLine import \
                      AccountingTransactionLine
 from Products.ERP5.Document.InventoryLine import InventoryLine

--- a/product/ERP5/Document/BankAccount.py
+++ b/product/ERP5/Document/BankAccount.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5.Document.Coordinate import Coordinate
 from Products.ERP5.Document.MetaNode import MetaNode
@@ -67,7 +67,7 @@ class BankAccount(Folder, Coordinate, MetaNode):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Coordinate )
+    __implements__ = ( interfaces.ICoordinate )


    security.declareProtected(Permissions.AccessContentsInformation, 'getReference')

--- a/product/ERP5/Document/BaseCategory.py
+++ b/product/ERP5/Document/BaseCategory.py
@@ -29,7 +29,7 @@
 from Products.CMFCategory.Category import BaseCategory as CMFBaseCategory
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Interface, Permissions, PropertySheet
+from Products.ERP5Type import interfaces, Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.Base import _aq_reset


--- a/product/ERP5/Document/BaseDomain.py
+++ b/product/ERP5/Document/BaseDomain.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Domain import Domain

 class BaseDomain(Domain):

--- a/product/ERP5/Document/Binder.py
+++ b/product/ERP5/Document/Binder.py
@@ -28,7 +28,7 @@

 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5.Document.Document import Document

--- a/product/ERP5/Document/Budget.py
+++ b/product/ERP5/Document/Budget.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Predicate import Predicate

 from Products.ERP5.Variated import Variated

--- a/product/ERP5/Document/BudgetCell.py
+++ b/product/ERP5/Document/BudgetCell.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5.Document.MetaNode import MetaNode


--- a/product/ERP5/Document/BudgetLine.py
+++ b/product/ERP5/Document/BudgetLine.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5.Variated import Variated

--- a/product/ERP5/Document/BudgetModel.py
+++ b/product/ERP5/Document/BudgetModel.py
@@ -27,7 +27,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Predicate import Predicate

 class BudgetModel(Predicate):

--- a/product/ERP5/Document/BudgetTransaction.py
+++ b/product/ERP5/Document/BudgetTransaction.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Document.Amount import Amount
 from zLOG import LOG

--- a/product/ERP5/Document/BudgetTransfer.py
+++ b/product/ERP5/Document/BudgetTransfer.py
@@ -30,7 +30,7 @@ from Products.ERP5.Document.Supply import Supply
 from zLOG import LOG

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject



--- a/product/ERP5/Document/BudgetTransferLine.py
+++ b/product/ERP5/Document/BudgetTransferLine.py
@@ -30,7 +30,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.SupplyLine import SupplyLine
 from Products.ERP5.Document.Amount import Amount

--- a/product/ERP5/Document/BudgetVariation.py
+++ b/product/ERP5/Document/BudgetVariation.py
@@ -27,7 +27,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Predicate import Predicate

 from Products.ERP5.Document.Delivery import Delivery

--- a/product/ERP5/Document/Bug.py
+++ b/product/ERP5/Document/Bug.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Ticket import Ticket

 class Bug(Ticket):

--- a/product/ERP5/Document/BusinessPath.py
+++ b/product/ERP5/Document/BusinessPath.py
@@ -31,7 +31,7 @@ from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

 from Products.CMFCore.PortalFolder import ContentFilter
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Path import Path

 import zope.interface
@@ -94,8 +94,8 @@ class BusinessPath(Path):
                    )

  # Declarative interfaces
-  zope.interface.implements(Interface.ICategoryAccessProvider,
-                            Interface.IArrow)
+  zope.interface.implements(interfaces.ICategoryAccessProvider,
+                            interfaces.IArrow)

  # IBusinessPath Interface
  security.declareProtected(Permissions.AccessContentsInformation, 'getSourceBaseCategoryList')

--- a/product/ERP5/Document/BusinessProcess.py
+++ b/product/ERP5/Document/BusinessProcess.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Path import Path


--- a/product/ERP5/Document/BusinessState.py
+++ b/product/ERP5/Document/BusinessState.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 class BusinessState(XMLObject):

--- a/product/ERP5/Document/Calendar.py
+++ b/product/ERP5/Document/Calendar.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Delivery import Delivery

 class Calendar(Delivery):

--- a/product/ERP5/Document/CalendarException.py
+++ b/product/ERP5/Document/CalendarException.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 class CalendarException(XMLObject):

--- a/product/ERP5/Document/Capacity.py
+++ b/product/ERP5/Document/Capacity.py
@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo

 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject



--- a/product/ERP5/Document/Career.py
+++ b/product/ERP5/Document/Career.py
@@ -29,7 +29,7 @@

 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Path import Path


--- a/product/ERP5/Document/Category.py
+++ b/product/ERP5/Document/Category.py
@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo

 from Products.ERP5.Document.MetaNode import MetaNode
 from Products.ERP5.Document.MetaResource import MetaResource
-from Products.ERP5Type import Interface, Permissions, PropertySheet
+from Products.ERP5Type import interfaces, Permissions, PropertySheet
 from Products.ERP5Type.Base import Base
 from Products.ERP5.Document.Predicate import Predicate


--- a/product/ERP5/Document/CategoryBudgetVariation.py
+++ b/product/ERP5/Document/CategoryBudgetVariation.py
@@ -28,7 +28,7 @@
 from AccessControl import ClassSecurityInfo

 from AccessControl.ZopeGuards import guarded_getattr
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.BudgetVariation import BudgetVariation



--- a/product/ERP5/Document/CategoryDivergenceTester.py
+++ b/product/ERP5/Document/CategoryDivergenceTester.py
@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo

 from Products.ERP5Type.DivergenceMessage import DivergenceMessage
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.PropertyDivergenceTester import \
                                               PropertyDivergenceTester

@@ -50,7 +50,7 @@ class CategoryDivergenceTester(PropertyDivergenceTester):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.DivergenceTester, )
+  __implements__ = ( interfaces.IDivergenceTester, )

  # Declarative properties
  property_sheets = (   PropertySheet.Base

--- a/product/ERP5/Document/Computer.py
+++ b/product/ERP5/Document/Computer.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Machine import Machine



--- a/product/ERP5/Document/Consumption.py
+++ b/product/ERP5/Document/Consumption.py
@@ -31,7 +31,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Variated import Variated

--- a/product/ERP5/Document/Container.py
+++ b/product/ERP5/Document/Container.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.XMLObject import XMLObject

@@ -63,7 +63,7 @@ class Container(Movement, XMLObject):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ContainerCell.py
+++ b/product/ERP5/Document/ContainerCell.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryCell import DeliveryCell

@@ -51,7 +51,7 @@ class ContainerCell(DeliveryCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ContainerLine.py
+++ b/product/ERP5/Document/ContainerLine.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Variated import Variated
@@ -54,7 +54,7 @@ class ContainerLine(DeliveryLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ContributionPredicate.py
+++ b/product/ERP5/Document/ContributionPredicate.py
@@ -29,7 +29,7 @@ from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.Cache import getReadOnlyTransactionCache, enableReadOnlyTransactionCache, disableReadOnlyTransactionCache


@@ -48,7 +48,7 @@ class ContributionPredicate(Predicate, XMLObject):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)

-  __implements__ = (Interface.Predicate,)
+  __implements__ = (interfaces.IPredicate,)

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Coordinate.py
+++ b/product/ERP5/Document/Coordinate.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base
 from Products.CMFDefault.utils import formatRFC822Headers
 import re
@@ -80,7 +80,7 @@ class Coordinate(Base):
    isRADContent = 1
    
    # Declarative interface
-    __implements__ = (Interface.Coordinate)
+    __implements__ = (interfaces.ICoordinate)

    # Declarative security (replaces __ac_permissions__)
    security = ClassSecurityInfo()

--- a/product/ERP5/Document/Currency.py
+++ b/product/ERP5/Document/Currency.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Resource import Resource

 from zLOG import LOG
@@ -49,7 +49,7 @@ class Currency(Resource):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Delivery.py
+++ b/product/ERP5/Document/Delivery.py
@@ -30,7 +30,7 @@
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.Base import WorkflowMethod
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Movement import Movement
 from Products.ERP5.Document.ImmobilisationDelivery import ImmobilisationDelivery

--- a/product/ERP5/Document/DeliveryCell.py
+++ b/product/ERP5/Document/DeliveryCell.py
@@ -31,7 +31,7 @@ from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base

 from Products.ERP5.Document.OrderLine import OrderLine
@@ -57,7 +57,7 @@ class DeliveryCell(MappedValue, Movement, ImmobilisationMovement):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/DeliveryLine.py
+++ b/product/ERP5/Document/DeliveryLine.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.XMLObject import XMLObject

@@ -56,7 +56,7 @@ class DeliveryLine(Movement, XMLObject, XMLMatrix, Variated,
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/DeliveryRule.py
+++ b/product/ERP5/Document/DeliveryRule.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule

 from zLOG import LOG
@@ -48,8 +48,8 @@ class DeliveryRule(Rule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)

-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/DependentCapacity.py
+++ b/product/ERP5/Document/DependentCapacity.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Capacity import Capacity

 class DependentCapacity(Capacity):

--- a/product/ERP5/Document/Device.py
+++ b/product/ERP5/Document/Device.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Item import Item

 class Device(Item):

--- a/product/ERP5/Document/Discount.py
+++ b/product/ERP5/Document/Discount.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 class Discount(XMLObject):

--- a/product/ERP5/Document/Document.py
+++ b/product/ERP5/Document/Document.py
@@ -37,7 +37,7 @@ from Acquisition import aq_base
 from Globals import PersistentMapping
 from Globals import get_request
 from Products.CMFCore.utils import getToolByName, _checkPermission
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.DateUtils import convertDateToHour, number_of_hours_in_day, number_of_hours_in_year
 from Products.ERP5Type.Utils import convertToUpperCase

--- a/product/ERP5/Document/Domain.py
+++ b/product/ERP5/Document/Domain.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.MetaResource import MetaResource
 from Products.ERP5.Document.MetaNode import MetaNode
@@ -82,7 +82,7 @@ class Domain(Predicate, MetaNode, MetaResource):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Predicate, )
+  __implements__ = ( interfaces.IPredicate, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/EmailDocument.py
+++ b/product/ERP5/Document/EmailDocument.py
@@ -35,7 +35,7 @@ from Products.ERP5Type.Base import WorkflowMethod
 from Products.CMFCore.utils import getToolByName, _checkPermission
 from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
 from Products.CMFDefault.utils import isHTMLSafe
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.TextDocument import TextDocument
 from Products.ERP5.Document.File import File
 from Products.ERP5.Document.Document import ConversionError, DocumentProxyMixin

--- a/product/ERP5/Document/ExtFolder.py
+++ b/product/ERP5/Document/ExtFolder.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ExtFile.ExtFile import ExtFile
 from Products.ExtFile.ExtImage import ExtImage

--- a/product/ERP5/Document/ExternalSource.py
+++ b/product/ERP5/Document/ExternalSource.py
@@ -27,7 +27,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Url import UrlMixIn
 from Products.ERP5.Document.Document import UpdateMixIn

--- a/product/ERP5/Document/File.py
+++ b/product/ERP5/Document/File.py
@@ -31,7 +31,7 @@ import re

 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Base import WorkflowMethod
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Cache import CachingMethod
 from Products.ERP5.Document.Document import Document
 from Products.ERP5.Document.Document import ConversionCacheMixin

--- a/product/ERP5/Document/GeographicAddress.py
+++ b/product/ERP5/Document/GeographicAddress.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base

 from Products.ERP5.Document.Coordinate import Coordinate
@@ -64,7 +64,7 @@ class GeographicAddress(Coordinate, Base):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Coordinate )
+    __implements__ = ( interfaces.ICoordinate )

    security.declareProtected(Permissions.AccessContentsInformation, 'asText')
    def asText(self):

--- a/product/ERP5/Document/Image.py
+++ b/product/ERP5/Document/Image.py
@@ -42,7 +42,7 @@ from Acquisition import aq_base

 from DocumentTemplate.DT_Util import html_quote
 from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.File import File
 from Products.ERP5.Document.Document import ConversionError


--- a/product/ERP5/Document/ImmobilisableItem.py
+++ b/product/ERP5/Document/ImmobilisableItem.py
@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 from string import capitalize

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.DateUtils import addToDate, getClosestDate, getIntervalBetweenDates 
 from Products.ERP5Type.DateUtils import getMonthAndDaysBetween, getRoundedMonthBetween

--- a/product/ERP5/Document/Immobilisation.py
+++ b/product/ERP5/Document/Immobilisation.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
 #from Products.ERP5.Core import MetaNode, MetaResource

 from Products.ERP5Type.XMLObject import XMLObject
@@ -62,7 +62,7 @@ class Immobilisation(XMLObject, Delivery):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ImmobilisationCell.py
+++ b/product/ERP5/Document/ImmobilisationCell.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
 #from Products.ERP5.Core import MetaNode, MetaResource

 from Products.ERP5Type.XMLObject import XMLObject
@@ -56,7 +56,7 @@ class ImmobilisationCell(Movement, XMLObject, ImmobilisationMovement):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ImmobilisationDelivery.py
+++ b/product/ERP5/Document/ImmobilisationDelivery.py
@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 from string import capitalize

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.DateUtils import addToDate, getClosestDate, getIntervalBetweenDates 
 from Products.ERP5Type.DateUtils import getMonthAndDaysBetween, getRoundedMonthBetween

--- a/product/ERP5/Document/ImmobilisationLine.py
+++ b/product/ERP5/Document/ImmobilisationLine.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces
 #from Products.ERP5.Core import MetaNode, MetaResource

 from Products.ERP5Type.XMLObject import XMLObject
@@ -57,7 +57,7 @@ class ImmobilisationLine(Movement, XMLObject, ImmobilisationMovement, DeliveryLi
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ImmobilisationMovement.py
+++ b/product/ERP5/Document/ImmobilisationMovement.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Amount import Amount
@@ -84,7 +84,7 @@ class ImmobilisationMovement(Movement, XMLObject):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/IndependentCapacity.py
+++ b/product/ERP5/Document/IndependentCapacity.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Capacity import Capacity

 class IndependentCapacity(Capacity):

--- a/product/ERP5/Document/InternetProtocolAddress.py
+++ b/product/ERP5/Document/InternetProtocolAddress.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base
 from Products.ERP5Type.Utils import convertToUpperCase

@@ -58,7 +58,7 @@ class InternetProtocolAddress(Base, Coordinate):
                      )

  # Declarative interfaces
-  __implements__ = ( Interface.Coordinate, )
+  __implements__ = ( interfaces.ICoordinate, )

  def asText(self):
    """

--- a/product/ERP5/Document/InventoryCell.py
+++ b/product/ERP5/Document/InventoryCell.py
@@ -29,7 +29,7 @@
 from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces

 from Products.ERP5.Document.DeliveryCell import DeliveryCell

@@ -53,7 +53,7 @@ class InventoryCell(DeliveryCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/InventoryLine.py
+++ b/product/ERP5/Document/InventoryLine.py
@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base

-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Document.Movement import Movement

@@ -52,7 +52,7 @@ class InventoryLine(DeliveryLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Invoice.py
+++ b/product/ERP5/Document/Invoice.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.AccountingTransaction import AccountingTransaction
 from Products.ERP5.Document.Delivery import Delivery
 from zLOG import LOG

--- a/product/ERP5/Document/InvoiceCell.py
+++ b/product/ERP5/Document/InvoiceCell.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryCell import DeliveryCell

@@ -53,7 +53,7 @@ class InvoiceCell(DeliveryCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/InvoiceLine.py
+++ b/product/ERP5/Document/InvoiceLine.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Variated import Variated
@@ -56,7 +56,7 @@ class InvoiceLine(DeliveryLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/InvoiceRule.py
+++ b/product/ERP5/Document/InvoiceRule.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.DeliveryRule import DeliveryRule

@@ -47,8 +47,8 @@ class InvoiceRule(DeliveryRule):
    isPortalContent = 1
    isRADContent = 1
    
-    __implements__ = ( Interface.Predicate,
-                       Interface.Rule )
+    __implements__ = ( interfaces.IPredicate,
+                       interfaces.IRule )

    # Declarative security
    security = ClassSecurityInfo()

--- a/product/ERP5/Document/InvoiceTransactionRule.py
+++ b/product/ERP5/Document/InvoiceTransactionRule.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.PredicateMatrix import PredicateMatrix

@@ -52,8 +52,8 @@ class InvoiceTransactionRule(Rule, PredicateMatrix):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)

-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/InvoicingRule.py
+++ b/product/ERP5/Document/InvoicingRule.py
@@ -29,7 +29,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.Rule import Rule


@@ -49,8 +49,8 @@ class InvoicingRule(Rule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)

-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Item.py
+++ b/product/ERP5/Document/Item.py
@@ -33,7 +33,7 @@ from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 from string import capitalize

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.DateUtils import addToDate, getClosestDate, getIntervalBetweenDates 
 from Products.ERP5Type.DateUtils import getMonthAndDaysBetween, getRoundedMonthBetween

--- a/product/ERP5/Document/LeavePeriod.py
+++ b/product/ERP5/Document/LeavePeriod.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.PresencePeriod import PresencePeriod

 class LeavePeriod(PresencePeriod):

--- a/product/ERP5/Document/Machine.py
+++ b/product/ERP5/Document/Machine.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Item import Item



--- a/product/ERP5/Document/MailMessage.py
+++ b/product/ERP5/Document/MailMessage.py
@@ -31,7 +31,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

 from Products.CMFMailIn.MailMessage import MailMessage as CMFMailInMessage
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Event import Event
 import smtplib

--- a/product/ERP5/Document/MappedValue.py
+++ b/product/ERP5/Document/MappedValue.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Utils import UpperCase

 from Products.ERP5.Document.Predicate import Predicate
@@ -66,7 +66,7 @@ class MappedValue(Predicate, Amount):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Predicate, Interface.Variated,)
+  __implements__ = ( interfaces.IPredicate, interfaces.IVariated,)

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/MetaNode.py
+++ b/product/ERP5/Document/MetaNode.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 #from Products.ERP5.Core.MetaNode import MetaNode as CoreMetaNode
 from Products.ERP5.Document.Organisation import Organisation as Node
 #from Node import Node

--- a/product/ERP5/Document/MetaResource.py
+++ b/product/ERP5/Document/MetaResource.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 #from Products.ERP5.Core.MetaResource import MetaResource as CoreMetaResource
 from Products.ERP5.Document.Resource import Resource


--- a/product/ERP5/Document/Movement.py
+++ b/product/ERP5/Document/Movement.py
@@ -29,7 +29,7 @@
 from warnings import warn
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base

 #from Products.ERP5.Core import MetaNode, MetaResource
@@ -183,7 +183,7 @@ class Movement(XMLObject, Amount):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/NodeBudgetVariation.py
+++ b/product/ERP5/Document/NodeBudgetVariation.py
@@ -28,7 +28,7 @@
 from AccessControl import ClassSecurityInfo

 from AccessControl.ZopeGuards import guarded_getattr
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.BudgetVariation import BudgetVariation



--- a/product/ERP5/Document/OpenOrder.py
+++ b/product/ERP5/Document/OpenOrder.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Delivery import Delivery

 class OpenOrder(Delivery):
@@ -45,7 +45,7 @@ class OpenOrder(Delivery):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = (Interface.Expandable, Interface.OpenOrderExpander)
+  __implements__ = (interfaces.IExpandable, interfaces.IOpenOrderExpander)

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/OpenOrderCell.py
+++ b/product/ERP5/Document/OpenOrderCell.py
@@ -28,7 +28,7 @@

 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.SupplyCell import SupplyCell

 class OpenOrderCell(SupplyCell):
@@ -47,7 +47,7 @@ class OpenOrderCell(SupplyCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/OpenOrderLine.py
+++ b/product/ERP5/Document/OpenOrderLine.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.SupplyLine import SupplyLine

 from zLOG import LOG
@@ -49,8 +49,8 @@ class OpenOrderLine(SupplyLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated,
-                       Interface.Predicate )
+    __implements__ = ( interfaces.IVariated,
+                       interfaces.IPredicate )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/OpenOrderRule.py
+++ b/product/ERP5/Document/OpenOrderRule.py
@@ -26,7 +26,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.DeliveryRule import DeliveryRule
 from zLOG import LOG, WARNING
@@ -47,8 +47,8 @@ class OpenOrderRule(DeliveryRule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)
  
-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Order.py
+++ b/product/ERP5/Document/Order.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base

 from Products.ERP5.Document.Delivery import Delivery

--- a/product/ERP5/Document/OrderCell.py
+++ b/product/ERP5/Document/OrderCell.py
@@ -31,7 +31,7 @@ from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base

 from Products.ERP5.Document.DeliveryCell import DeliveryCell
@@ -53,7 +53,7 @@ class OrderCell(DeliveryCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/OrderLine.py
+++ b/product/ERP5/Document/OrderLine.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Document.Movement import Movement

@@ -62,7 +62,7 @@ class OrderLine(DeliveryLine):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    def applyToOrderLineRelatedMovement(self, portal_type='Simulation Movement', 
                                        method_id = 'expand'):

--- a/product/ERP5/Document/OrderRule.py
+++ b/product/ERP5/Document/OrderRule.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.DeliveryRule import DeliveryRule
 from zLOG import LOG, WARNING
@@ -48,8 +48,8 @@ class OrderRule(DeliveryRule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)
  
-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Organisation.py
+++ b/product/ERP5/Document/Organisation.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 #from Products.ERP5.Core.MetaNode import MetaNode

--- a/product/ERP5/Document/PDFDocument.py
+++ b/product/ERP5/Document/PDFDocument.py
@@ -30,7 +30,7 @@ import tempfile, os, cStringIO
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Cache import CachingMethod
 from Products.ERP5.Document.Image import Image
 from Products.ERP5.Document.Document import ConversionCacheMixin, ConversionError

--- a/product/ERP5/Document/PDFTypeInformation.py
+++ b/product/ERP5/Document/PDFTypeInformation.py
@@ -27,7 +27,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type import USE_BASE_TYPE

 if not USE_BASE_TYPE:

--- a/product/ERP5/Document/PackingList.py
+++ b/product/ERP5/Document/PackingList.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Delivery import Delivery
 from zLOG import LOG

--- a/product/ERP5/Document/Path.py
+++ b/product/ERP5/Document/Path.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 #from Products.ERP5.Core import MetaNode, MetaResource

 from Products.ERP5.Document.MappedValue import MappedValue
@@ -58,7 +58,7 @@ class Path(MappedValue):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Predicate )
+  __implements__ = ( interfaces.IPredicate )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/PaySheetCell.py
+++ b/product/ERP5/Document/PaySheetCell.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.InvoiceCell import InvoiceCell
 from zLOG import LOG

@@ -50,7 +50,7 @@ class PaySheetCell(InvoiceCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/PaySheetLine.py
+++ b/product/ERP5/Document/PaySheetLine.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.InvoiceLine import InvoiceLine
 from zLOG import LOG

@@ -50,7 +50,7 @@ class PaySheetLine(InvoiceLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/PaySheetModelLine.py
+++ b/product/ERP5/Document/PaySheetModelLine.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5.Document.PaySheetLine import PaySheetLine

@@ -52,7 +52,7 @@ class PaySheetModelLine(PaySheetLine, Predicate):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/PaySheetModelSlice.py
+++ b/product/ERP5/Document/PaySheetModelSlice.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.DeliveryCell import DeliveryCell
 from zLOG import LOG

@@ -47,7 +47,7 @@ class PaySheetModelSlice(DeliveryCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/PaymentCondition.py
+++ b/product/ERP5/Document/PaymentCondition.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 class PaymentCondition(XMLObject):

--- a/product/ERP5/Document/PaymentRule.py
+++ b/product/ERP5/Document/PaymentRule.py
@@ -30,7 +30,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule

 from zLOG import LOG, INFO
@@ -51,8 +51,8 @@ class PaymentRule(Rule):
    security = ClassSecurityInfo()
    security.declareObjectProtected(Permissions.AccessContentsInformation)

-    __implements__ = ( Interface.Predicate,
-                       Interface.Rule )
+    __implements__ = ( interfaces.IPredicate,
+                       interfaces.IRule )

    # Default Properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Person.py
+++ b/product/ERP5/Document/Person.py
@@ -36,7 +36,7 @@ from Acquisition import aq_base

 #from Products.ERP5.Core.Node import Node

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Utils import assertAttributePortalType
 from Products.ERP5Type.XMLObject import XMLObject


--- a/product/ERP5/Document/PortalTest.py
+++ b/product/ERP5/Document/PortalTest.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix

 from Products.ERP5.Document.Resource import Resource

--- 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 import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type.Document import newTempBase
 from Products.ERP5Type.XMLObject import XMLObject
@@ -80,7 +80,7 @@ class Predicate(XMLObject, Folder):
                    )

  # Declarative interfaces
-  __implements__ = ( Interface.Predicate )
+  __implements__ = ( interfaces.IPredicate )

  security.declareProtected( Permissions.AccessContentsInformation, 'test' )
  def test(self, context, tested_base_category_list=None, 

--- a/product/ERP5/Document/PredicateMatrix.py
+++ b/product/ERP5/Document/PredicateMatrix.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5Type.XMLMatrix import XMLMatrix


--- a/product/ERP5/Document/PresencePeriod.py
+++ b/product/ERP5/Document/PresencePeriod.py
@@ -31,7 +31,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Document.Alarm import PeriodicityMixin
 from Products.ERP5.Document.Movement import Movement

--- a/product/ERP5/Document/Pricing.py
+++ b/product/ERP5/Document/Pricing.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix

 from Products.ERP5.Document.Resource import Resource

--- a/product/ERP5/Document/ProductionOrderRule.py
+++ b/product/ERP5/Document/ProductionOrderRule.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.OrderRule import OrderRule
 from Products.ERP5.Document.TransformationRule import TransformationRuleMixin
@@ -48,8 +48,8 @@ class ProductionOrderRule(OrderRule):
    security = ClassSecurityInfo()
    security.declareObjectProtected(Permissions.AccessContentsInformation)

-    __implements = ( Interface.Predicate,
-                     Interface.Rule )
+    __implements = ( interfaces.IPredicate,
+                     interfaces.IRule )

    # Default Properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ProductionReport.py
+++ b/product/ERP5/Document/ProductionReport.py
@@ -28,7 +28,7 @@

 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Delivery import Delivery


--- a/product/ERP5/Document/ProductionReportCell.py
+++ b/product/ERP5/Document/ProductionReportCell.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryCell import DeliveryCell

@@ -48,7 +48,7 @@ class ProductionReportCell(DeliveryCell):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/ProductionReportLine.py
+++ b/product/ERP5/Document/ProductionReportLine.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.DeliveryLine import DeliveryLine

 class ProductionReportLine(DeliveryLine):

--- a/product/ERP5/Document/Project.py
+++ b/product/ERP5/Document/Project.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Order import Order

 class Project(Order):

--- a/product/ERP5/Document/ProjectReport.py
+++ b/product/ERP5/Document/ProjectReport.py
@@ -27,7 +27,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.Delivery import Delivery


--- a/product/ERP5/Document/PropertyDivergenceTester.py
+++ b/product/ERP5/Document/PropertyDivergenceTester.py
@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.XMLObject import XMLObject

 from Products.ERP5Type.DivergenceMessage import DivergenceMessage
-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces

 class PropertyDivergenceTester(XMLObject):
  """
@@ -50,7 +50,7 @@ class PropertyDivergenceTester(XMLObject):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.DivergenceTester, )
+  __implements__ = ( interfaces.IDivergenceTester, )

  # Declarative properties
  property_sheets = (   PropertySheet.Base

--- a/product/ERP5/Document/QuantityDivergenceTester.py
+++ b/product/ERP5/Document/QuantityDivergenceTester.py
@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo

 from Products.ERP5Type.DivergenceMessage import DivergenceMessage
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.PropertyDivergenceTester import \
                                              PropertyDivergenceTester

@@ -50,7 +50,7 @@ class QuantityDivergenceTester(PropertyDivergenceTester):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.DivergenceTester, )
+  __implements__ = ( interfaces.IDivergenceTester, )


  # Declarative properties

--- a/product/ERP5/Document/Resource.py
+++ b/product/ERP5/Document/Resource.py
@@ -32,7 +32,7 @@ from warnings import warn

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.Base import Base

@@ -58,7 +58,7 @@ class Resource(XMLMatrix, Variated):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/RoleDefinition.py
+++ b/product/ERP5/Document/RoleDefinition.py
@@ -27,7 +27,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 class RoleDefinition(XMLObject):

--- a/product/ERP5/Document/Rule.py
+++ b/product/ERP5/Document/Rule.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Predicate import Predicate
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
@@ -73,8 +73,8 @@ class Rule(Predicate, XMLObject):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)
  
-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/SaleOpportunity.py
+++ b/product/ERP5/Document/SaleOpportunity.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Ticket import Ticket

 class SaleOpportunity(Ticket):

--- a/product/ERP5/Document/SetPricing.py
+++ b/product/ERP5/Document/SetPricing.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix

 from Products.ERP5.Document.Resource import Resource

--- a/product/ERP5/Document/SimulationMovement.py
+++ b/product/ERP5/Document/SimulationMovement.py
@@ -30,7 +30,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable

 from Products.ERP5.Document.Movement import Movement
@@ -101,7 +101,7 @@ class SimulationMovement(Movement):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Variated, )
+  __implements__ = ( interfaces.IVariated, )

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/SubscriptionItem.py
+++ b/product/ERP5/Document/SubscriptionItem.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Item import Item

 class SubscriptionItem(Item):
@@ -47,7 +47,7 @@ class SubscriptionItem(Item):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = (Interface.Expandable, Interface.OpenOrderExpander)
+  __implements__ = (interfaces.IExpandable, interfaces.IOpenOrderExpander)

  # Declarative properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Supply.py
+++ b/product/ERP5/Document/Supply.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Path import Path


--- a/product/ERP5/Document/SupplyCell.py
+++ b/product/ERP5/Document/SupplyCell.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryCell import DeliveryCell
 from Products.ERP5.Document.Path import Path
@@ -54,7 +54,7 @@ class SupplyCell(Predicate, DeliveryCell, Path):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/SupplyChain.py
+++ b/product/ERP5/Document/SupplyChain.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from Products.CMFCore.utils import getToolByName
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Path import Path


--- a/product/ERP5/Document/SupplyLine.py
+++ b/product/ERP5/Document/SupplyLine.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5.Document.Path import Path
@@ -52,8 +52,8 @@ class SupplyLine(DeliveryLine, Path):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated,
-                       Interface.Predicate )
+    __implements__ = ( interfaces.IVariated,
+                       interfaces.IPredicate )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/SupplyLink.py
+++ b/product/ERP5/Document/SupplyLink.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix

 from Products.ERP5.Document.DeliveryLine import DeliveryLine

--- a/product/ERP5/Document/SupplyRule.py
+++ b/product/ERP5/Document/SupplyRule.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass, PersistentMapping
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Document.MappedValue import MappedValue 


--- a/product/ERP5/Document/TaxLine.py
+++ b/product/ERP5/Document/TaxLine.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.DeliveryLine import DeliveryLine

@@ -44,7 +44,7 @@ class TaxLine(DeliveryLine):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    # Declarative properties
    property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/TaxRule.py
+++ b/product/ERP5/Document/TaxRule.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.DeliveryRule import DeliveryRule

@@ -43,8 +43,8 @@ class TaxRule(DeliveryRule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)
  
-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Telephone.py
+++ b/product/ERP5/Document/Telephone.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base

 from Products.ERP5.Document.Coordinate import Coordinate

--- a/product/ERP5/Document/TextDocument.py
+++ b/product/ERP5/Document/TextDocument.py
@@ -32,7 +32,7 @@ from zLOG import LOG, WARNING
 from Products.ERP5Type.Base import WorkflowMethod
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Document import Document, ConversionError
 from Products.ERP5Type.WebDAVSupport import TextContent
 from Products.CMFDefault.utils import isHTMLSafe

--- a/product/ERP5/Document/Ticket.py
+++ b/product/ERP5/Document/Ticket.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Movement import Movement
 from Products.ERP5.Document.Project import Project


--- a/product/ERP5/Document/TradeModelCell.py
+++ b/product/ERP5/Document/TradeModelCell.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces

 from Products.ERP5.Document.TradeModelLine import TradeModelLine
 from Products.ERP5.Document.MappedValue import MappedValue
@@ -48,9 +48,9 @@ class TradeModelCell(TradeModelLine, MappedValue):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    #    Interface.IVariated as soon as Interface.Variated will be zope3
+    #    interfaces.IVariated as soon as interfaces.IVariated will be zope3
    zope.interface.implements(
-        Interface.ITransformation
+        interfaces.ITransformation
    )

    # Declarative properties

--- a/product/ERP5/Document/TradeModelLine.py
+++ b/product/ERP5/Document/TradeModelLine.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix

 from Products.ERP5.Document.Amount import Amount
@@ -50,9 +50,9 @@ class TradeModelLine(XMLMatrix, Amount, Variated):
    security.declareObjectProtected(Permissions.AccessContentsInformation)

    # Declarative interfaces
-    # Interface.IVariated - as soon as Interface.Variated will be zope3
+    # interfaces.IVariated - as soon as interfaces.IVariated will be zope3
    zope.interface.implements(
-        Interface.ITransformation
+        interfaces.ITransformation
    )

    # Declarative properties

--- a/product/ERP5/Document/TradeModelRule.py
+++ b/product/ERP5/Document/TradeModelRule.py
@@ -28,7 +28,7 @@
 ##############################################################################

 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.TransformationRule import TransformationRule

 from Products.ERP5.Document.Rule import Rule
@@ -48,8 +48,8 @@ class TradeModelRule(TransformationRule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)

-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5/Document/Transformation.py
+++ b/product/ERP5/Document/Transformation.py
@@ -32,7 +32,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Interface
+from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 from Products.ERP5.Variated import Variated
@@ -80,7 +80,7 @@ class Transformation(XMLObject, Predicate, Variated):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )


    security.declareProtected(Permissions.AccessContentsInformation,

--- a/product/ERP5/Document/TransformationRule.py
+++ b/product/ERP5/Document/TransformationRule.py
@@ -33,7 +33,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule
 from Products.ERP5.Document.SimulationMovement import SimulationMovement
 from Products.ERP5Type.Errors import TransformationRuleError
@@ -118,8 +118,8 @@ class TransformationRule(TransformationRuleMixin, Rule):
  security = ClassSecurityInfo()
  security.declareObjectProtected(Permissions.AccessContentsInformation)

-  __implements__ = ( Interface.Predicate,
-                     Interface.Rule )
+  __implements__ = ( interfaces.IPredicate,
+                     interfaces.IRule )
  # Default Properties
  property_sheets = ( PropertySheet.Base
                      , PropertySheet.XMLObject

--- a/product/ERP5/Document/TransformationSourcingRule.py
+++ b/product/ERP5/Document/TransformationSourcingRule.py
@@ -33,7 +33,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Rule import Rule

 from zLOG import LOG
@@ -139,8 +139,8 @@ class TransformationSourcingRule(TransformationSourcingRuleMixin, Rule):
    # Declarative security
    security = ClassSecurityInfo()
    security.declareObjectProtected(Permissions.AccessContentsInformation)
-    __implements__ = ( Interface.Predicate,
-                       Interface.Rule )
+    __implements__ = ( interfaces.IPredicate,
+                       interfaces.IRule )
    # Default Properties
    property_sheets = ( PropertySheet.Base
                      , PropertySheet.XMLObject

--- a/product/ERP5/Document/TransformedResource.py
+++ b/product/ERP5/Document/TransformedResource.py
@@ -30,7 +30,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.Utils import cartesianProduct
@@ -77,7 +77,7 @@ class TransformedResource(Predicate, XMLObject, XMLMatrix, Amount):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )




--- a/product/ERP5/Document/Url.py
+++ b/product/ERP5/Document/Url.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.Base import Base
 from Products.ERP5.Document.Coordinate import Coordinate
 from Products.ERP5.Tool.NotificationTool import buildEmailMessage

--- a/product/ERP5/Document/VariatedProperty.py
+++ b/product/ERP5/Document/VariatedProperty.py
@@ -29,7 +29,7 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Variated import Variated
@@ -65,7 +65,7 @@ class VariatedProperty(XMLObject, XMLMatrix):
                      )

    # Declarative interfaces
-    __implements__ = ( Interface.Variated, )
+    __implements__ = ( interfaces.IVariated, )

    security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent' )
    def newCellContent(self, id, portal_type='Set Mapped Value', **kw):

--- a/product/ERP5/Document/Variation.py
+++ b/product/ERP5/Document/Variation.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5Type.XMLObject import XMLObject

 #from Products.ERP5.Core import Variation

--- a/product/ERP5/Document/VariationImage.py
+++ b/product/ERP5/Document/VariationImage.py
@@ -29,7 +29,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Variation import Variation
 from Products.ERP5.Document.Image import Image


--- a/product/ERP5/Document/WebSite.py
+++ b/product/ERP5/Document/WebSite.py
@@ -29,7 +29,7 @@ from Acquisition import ImplicitAcquisitionWrapper, aq_base, aq_inner
 from AccessControl import ClassSecurityInfo

 from Products.ERP5.Document.WebSection import WebSection, WEBSECTION_KEY
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface, Cache
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces, Cache
 from Products.ERP5Type.Cache import CachingMethod

 from Globals import get_request

--- a/product/ERP5/Document/Wiki.py
+++ b/product/ERP5/Document/Wiki.py
@@ -28,7 +28,7 @@

 from AccessControl import ClassSecurityInfo

-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
+from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
 from Products.ERP5.Document.Document import Document

 from zLOG import LOG

--- a/product/ERP5/Variated.py
+++ b/product/ERP5/Variated.py
@@ -30,7 +30,7 @@ from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass
 from Products.CMFCore.utils import getToolByName

-from Products.ERP5Type import Context, Interface, Permissions
+from Products.ERP5Type import Context, interfaces, Permissions
 from Products.ERP5Type.Base import Base
 from Products.CMFCategory.Renderer import Renderer

@@ -57,7 +57,7 @@ class Variated(Base):
  security = ClassSecurityInfo()

  # Declarative interfaces
-  __implements__ = (Interface.Variated, )
+  __implements__ = (interfaces.IVariated, )

  security.declareProtected(Permissions.AccessContentsInformation, 
                            'getVariationBaseCategoryList')

--- a/product/ERP5/VariationValue.py
+++ b/product/ERP5/VariationValue.py
@@ -26,7 +26,7 @@
 #
 ##############################################################################

-from Products.ERP5Type import Interface, Permissions
+from Products.ERP5Type import interfaces, Permissions
 from Products.ERP5Type.Context import Context
 from Products.ERP5Type.Base import Base
 from Globals import InitializeClass
@@ -47,7 +47,7 @@ class VariationValue(Context, Variated):
  """

  # Declarative interfaces
-  __implements__ = (Interface.Variated)
+  __implements__ = (interfaces.IVariated)

  def __init__(self, context=None, REQUEST=None, **kw):
    Context.__init__(self, context=context, REQUEST=REQUEST, **kw)

--- a/product/ERP5Catalog/Document/Archive.py
+++ b/product/ERP5Catalog/Document/Archive.py
@@ -29,7 +29,7 @@


 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import PropertySheet, Permissions, Interface
+from Products.ERP5Type import PropertySheet, Permissions, interfaces
 from Globals import InitializeClass
 from Products.ERP5.Document.Predicate import Predicate

@@ -51,7 +51,7 @@ class Archive(Predicate):
  security.declareObjectProtected(Permissions.AccessContentsInformation)

  # Declarative interfaces
-  __implements__ = ( Interface.Predicate, )
+  __implements__ = ( interfaces.IPredicate, )

  # Default Properties
  property_sheets = ( PropertySheet.Base

--- a/product/ERP5SyncML/Conduit/ERP5Conduit.py
+++ b/product/ERP5SyncML/Conduit/ERP5Conduit.py
@@ -33,7 +33,7 @@ from DateTime.DateTime import DateTime
 from email.MIMEBase import MIMEBase
 from email import Encoders
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, Interface
+from Products.ERP5Type import Permissions, interfaces
 from Globals import PersistentMapping
 import pickle
 from cStringIO import StringIO
@@ -83,7 +83,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
  """

  # Declarative interfaces
-  __implements__ = ( Interface.IConduit, )
+  __implements__ = ( interfaces.IConduit, )

  # Declarative security
  security = ClassSecurityInfo()

--- a/product/ERP5SyncML/Interface/__init__.py
+++ b/product/ERP5SyncML/Interface/__init__.py
--- a/product/ERP5SyncML/Interface/IConduit.py
+++ b/product/ERP5SyncML/Interface/IConduit.py
@@ -26,11 +26,7 @@
 #
 ##############################################################################

-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface

 class IConduit(Interface):
  """

--- a/product/ERP5Type/CachePlugins/DistributedRamCache.py
+++ b/product/ERP5Type/CachePlugins/DistributedRamCache.py
@@ -34,7 +34,7 @@ from thread import get_ident
 from zLOG import LOG
 from BaseCache import BaseCache
 from BaseCache import CacheEntry
-from Products.ERP5Type import Interface
+from Products.ERP5Type import interfaces
 import zope.interface

 try:
@@ -50,7 +50,7 @@ class DistributedRamCache(BaseCache):
  """ Memcached based cache plugin. """

  zope.interface.implements(
-        Interface.ICachePlugin
+        interfaces.ICachePlugin
    )

  def __init__(self, params={}):

--- a/product/ERP5Type/CachePlugins/RamCache.py
+++ b/product/ERP5Type/CachePlugins/RamCache.py
@@ -33,7 +33,7 @@ Local RAM based cache plugin.

 import time
 from BaseCache import BaseCache, CacheEntry
-from Products.ERP5Type import Interface
+from Products.ERP5Type import interfaces
 import zope.interface

 def calcPythonObjectMemorySize(i):
@@ -53,7 +53,7 @@ class RamCache(BaseCache):
  """ RAM based cache plugin."""

  zope.interface.implements(
-        Interface.ICachePlugin
+        interfaces.ICachePlugin
    )

  _cache_dict = {}

--- a/product/ERP5Type/CachePlugins/SQLCache.py
+++ b/product/ERP5Type/CachePlugins/SQLCache.py
@@ -36,7 +36,7 @@ import time
 import base64
 from zLOG import LOG
 from BaseCache import BaseCache, CacheEntry, CachedMethodError
-from Products.ERP5Type import Interface
+from Products.ERP5Type import interfaces
 import zope.interface

 try:
@@ -63,7 +63,7 @@ class SQLCache(BaseCache):
  """ SQL based cache plugin. """

  zope.interface.implements(
-        Interface.ICachePlugin
+        interfaces.ICachePlugin
    )

  cache_expire_check_interval = 3600

--- a/product/ERP5Type/CachePlugins/ZODBCache.py
+++ b/product/ERP5Type/CachePlugins/ZODBCache.py
@@ -33,7 +33,7 @@ ZODB Based cache plugin.
 import time
 from BaseCache import BaseCache, CacheEntry
 from BTrees.OOBTree import OOBTree
-from Products.ERP5Type import Interface
+from Products.ERP5Type import interfaces
 import zope.interface

 PRIVATE_ATTRIBUTE_ZODB_CACHE_NAME = '_zodb_cache'
@@ -42,7 +42,7 @@ class ZODBCache(BaseCache):
  """ ZODB based cache plugin."""

  zope.interface.implements(
-        Interface.ICachePlugin
+        interfaces.ICachePlugin
    )

  cache_tool = None

--- a/product/ERP5Type/Constraint/Constraint.py
+++ b/product/ERP5Type/Constraint/Constraint.py
@@ -29,7 +29,7 @@
 ##############################################################################

 from Products.CMFCore.Expression import Expression
-from Products.ERP5Type.Interface import Constraint as IConstraint
+from Products.ERP5Type.interfaces import IConstraint
 from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage

 class Constraint:

--- a/product/ERP5Type/Interface/IValueAccessProvider.py
+++ b/product/ERP5Type/Interface/IValueAccessProvider.py
-##############################################################################
-#
-# Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from zope.interface import Interface
-
-class IValueAccessProvider(Interface):
-  """
-    This interface defines the methods which must be implemented
-    by a class in order to support Value accessors.
-  """
-  def _getDefaultValue(id, spec=(), filter=None, portal_type=(), checked_permission=None, **kw):
-    """
-    """
-
-  def _getValueList(id, spec=(), filter=None, portal_type=(), checked_permission=None, **kw):
-    """
-    """
\ No newline at end of file
--- a/product/ERP5Type/Interface/__init__.py
+++ b/product/ERP5Type/Interface/__init__.py
-from Constraint import Constraint
-from IValueAccessProvider import IValueAccessProvider
-from ICategoryAccessProvider import ICategoryAccessProvider
-from ICachePlugin import ICachePlugin
-
--- a/product/ERP5Type/Utils.py
+++ b/product/ERP5Type/Utils.py
@@ -524,7 +524,6 @@ def registerBaseCategories(property_sheet):
    base_category_dict[bc] = 1

 def importLocalInterface(module_id, path = None):
-  import Products.ERP5Type.Interface
  if path is None:
    instance_home = getConfiguration().instancehome
    path = os.path.join(instance_home, "interfaces")

--- a/product/ERP5Type/interfaces/__init__.py
+++ b/product/ERP5Type/interfaces/__init__.py
+from cache_plugin import ICachePlugin
+from category_access_provider import ICategoryAccessProvider
+from constraint import IConstraint
--- a/product/ERP5Type/Interface/ICachePlugin.py
+++ b/product/ERP5Type/Interface/ICachePlugin.py
--- a/product/ERP5Type/Interface/ICategoryAccessProvider.py
+++ b/product/ERP5Type/Interface/ICategoryAccessProvider.py
--- a/product/ERP5Type/Interface/Constraint.py
+++ b/product/ERP5Type/Interface/Constraint.py
@@ -31,7 +31,7 @@

 from zope.interface import Interface, Attribute

-class Constraint(Interface):
+class IConstraint(Interface):
  """ERP5 Constraints are classes that are in charge of checking wether an
  object is in consistent state or not.