Move Predicate.py from ERP5.Document to ERP5Type.Core as it will later

be needed to implement constraints in ZODB Property Sheets



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

bt5/erp5_simulation/DocumentTemplateItem/DeliveryRootSimulationRule.py

@@ -32,7 +32,7 @@ will replace DeliveryRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py

@@ -32,7 +32,7 @@ will replace DeliveryRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/InvoiceRootSimulationRule.py

@@ -32,7 +32,7 @@ will replace InvoiceRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py

@@ -32,7 +32,7 @@ will replace InvoicingRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/InvoiceTransactionSimulationRule.py

@@ -32,7 +32,7 @@ will replace InvoicingRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/OrderRootSimulationRule.py

@@ -32,7 +32,7 @@ will replace OrderRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/PaymentSimulationRule.py

@@ -32,7 +32,7 @@ will replace PaymentRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py

@@ -32,7 +32,7 @@ will replace DeliveryRule.
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.mixin.rule import RuleMixin
 from Products.ERP5.mixin.movement_collection_updater import \
      MovementCollectionUpdaterMixin

bt5/erp5_simulation/bt/revision

-141
+142
\ No newline at end of file

product/ERP5/Document/AccountingRuleCell.py

@@ -31,7 +31,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Document.Invoice import Invoice
 
 class AccountingRuleCell(Predicate, Invoice):

product/ERP5/Document/Budget.py

@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 from Products.ERP5.Variated import Variated
 

product/ERP5/Document/BudgetCell.py

@@ -30,7 +30,7 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Document.MetaNode import MetaNode
 from Products.ERP5.Document.Movement import Movement
 

product/ERP5/Document/BudgetLine.py

@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLMatrix import XMLMatrix
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Variated import Variated
 
 

product/ERP5/Document/BudgetModel.py

@@ -28,7 +28,7 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 class BudgetModel(Predicate):
   """A model of budget, with all budget variation

product/ERP5/Document/BudgetVariation.py

@@ -28,7 +28,7 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 class BudgetVariation(Predicate):
   """Base class for budget variations.

product/ERP5/Document/BusinessPath.py

@@ -33,7 +33,7 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.Path import Path
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 import zope.interface
 

product/ERP5/Document/Category.py

@@ -34,7 +34,7 @@ from Products.ERP5.Document.MetaResource import MetaResource
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.Base import Base
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 from zLOG import LOG
 

product/ERP5/Document/CategoryMembershipEquivalenceTester.py

@@ -29,7 +29,7 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 

product/ERP5/Document/ContributionPredicate.py

@@ -28,7 +28,7 @@
 
 from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Cache import getReadOnlyTransactionCache, enableReadOnlyTransactionCache, disableReadOnlyTransactionCache

product/ERP5/Document/DateTimeEquivalenceTester.py

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 

product/ERP5/Document/Domain.py

@@ -32,7 +32,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 
 from Products.ERP5.Document.MetaResource import MetaResource
 from Products.ERP5.Document.MetaNode import MetaNode
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 class Domain(Predicate, MetaNode, MetaResource):
   """

product/ERP5/Document/FloatEquivalenceTester.py

@@ -31,7 +31,7 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 

product/ERP5/Document/MappedValue.py

@@ -30,7 +30,7 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Document.Amount import Amount
 
 class MappedValue(Predicate, Amount):

product/ERP5/Document/OrderBuilder.py

@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Document.Amount import Amount
 from Products.ERP5.MovementGroup import MovementGroupNode
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable

product/ERP5/Document/PredicateGroup.py

@@ -26,7 +26,7 @@
 #
 ##############################################################################
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 # Just for compatibility    
 class PredicateGroup(Predicate):

product/ERP5/Document/RoundingModel.py

@@ -27,7 +27,7 @@
 ##############################################################################
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import PropertySheet, Permissions
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type.Utils import UpperCase
 from decimal import Decimal
 from Products.ERP5.Tool.RoundingTool import ROUNDING_OPTION_DICT

product/ERP5/Document/SolverTypeInformation.py

@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.ERP5Type import ERP5TypeInformation
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 class SolverTypeInformation(Predicate, ERP5TypeInformation):
   """

product/ERP5/Document/StringEquivalenceTester.py

@@ -31,7 +31,7 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 

product/ERP5/Document/TradeModelLine.py

@@ -33,7 +33,7 @@ from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Document.Amount import Amount
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.AggregatedAmountList import AggregatedAmountList
 from Products.ERP5.Document.TradeCondition import TradeCondition
 from Products.ERP5.PropertySheet.TradeModelLine import (TARGET_LEVEL_MOVEMENT,

product/ERP5/Document/Transformation.py

@@ -40,7 +40,7 @@ from Products.ERP5Type.XMLObject import XMLObject
 
 from Products.ERP5.Variated import Variated
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 from Products.CMFCategory.Renderer import Renderer
 from Products.ERP5.AggregatedAmountList import AggregatedAmountList

product/ERP5/Document/TransformedResource.py

@@ -39,7 +39,7 @@ from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Document.Amount import Amount
 from Products.ERP5.AggregatedAmountList import AggregatedAmountList
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 class TransformedResource(Predicate, XMLObject, XMLMatrix, Amount):
     """

product/ERP5/Document/VariationEquivalenceTester.py

@@ -29,7 +29,7 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 

product/ERP5/mixin/composition.py

@@ -32,7 +32,7 @@ from Acquisition import aq_base
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Cache import transactional_cached
 from Products.ERP5Type.Utils import sortValueList
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery
 
 

product/ERP5/mixin/rule.py

@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type import Permissions, interfaces
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 
 def _compare(tester_list, prevision_movement, decision_movement):
   for tester in tester_list:

product/ERP5/tests/testPredicate.py

@@ -274,7 +274,7 @@ class TestPredicates(TestPredicateMixIn):
   def test_Interface(self):
     """Test Predicate implements Predicate interface."""
     from Products.ERP5Type.interfaces import IPredicate
-    from Products.ERP5Type.Document.Predicate import Predicate
+    from Products.ERP5Type.Core.Predicate import Predicate
     predicate = self.createPredicate()
     self.failUnless(IPredicate.providedBy(predicate))
     from zope.interface.verify import verifyClass

product/ERP5Catalog/Document/Archive.py

@@ -31,7 +31,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import PropertySheet, Permissions, interfaces
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from zope.interface import implements
 
 class Archive(Predicate):

product/ERP5Legacy/Document/Rule.py

@@ -32,7 +32,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5.Document.Predicate import Predicate
+from Products.ERP5Type.Core.Predicate import Predicate
 from Acquisition import aq_base
 
 class Rule(Predicate, XMLObject):