diff --git a/product/ERP5Legacy/tests/testLegacyPackingList.py b/product/ERP5Legacy/tests/testLegacyPackingList.py index a08309a49b1a3608449bd5a6b1db9ed342bf186a..265acb104ee0e3c24a2989488f92656cab0ba11c 100644 --- a/product/ERP5Legacy/tests/testLegacyPackingList.py +++ b/product/ERP5Legacy/tests/testLegacyPackingList.py @@ -32,7 +32,7 @@ import transaction from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from zLOG import LOG from Products.ERP5Type.tests.Sequence import SequenceList -from testLegacyRuleOrder import TestOrderMixin +from testLegacyOrder import TestOrderMixin from DateTime import DateTime class TestPackingListMixin(TestOrderMixin): @@ -152,22 +152,6 @@ class TestPackingListMixin(TestOrderMixin): """ return 1 - def validateRules(self): - """ - try to validate all rules in rule_tool. - """ - rule_tool = self.getRuleTool() - for rule in rule_tool.contentValues( - portal_type=rule_tool.getPortalRuleTypeList()): - if rule.getValidationState() != 'validated': - rule.validate() - - for rule in rule_tool.contentValues( - portal_type=rule_tool.getPortalRuleTypeList()): - if rule.getValidationState() == 'validated' and rule.getReference() == 'default_accounting_transaction_rule': - rule.invalidate() - - def stepCheckOrderPackingList(self, sequence=None, sequence_list=None, **kw): """ Test if packing list is matching order diff --git a/product/ERP5Legacy/tests/testLegacyProductionOrder.py b/product/ERP5Legacy/tests/testLegacyProductionOrder.py index 4629373e80f12f1911442f598db52bad0c1f19af..dd555755d34f0c5913aa61dc9c130256aefbdd92 100644 --- a/product/ERP5Legacy/tests/testLegacyProductionOrder.py +++ b/product/ERP5Legacy/tests/testLegacyProductionOrder.py @@ -36,7 +36,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from zLOG import LOG from Products.ERP5Type.tests.Sequence import SequenceList from Products.CMFCore.utils import getToolByName -from testLegacyRuleOrder import TestOrderMixin +from testLegacyOrder import TestOrderMixin class TestProductionOrderMixin(TestOrderMixin): diff --git a/product/ERP5Legacy/tests/testLegacySimulationPackingList.py b/product/ERP5Legacy/tests/testLegacySimulationPackingList.py index eac3559e27118eedc1cb452c7030cd44998bd181..c4bde9ef3190a470f3fc4596385988ca65df0fdb 100644 --- a/product/ERP5Legacy/tests/testLegacySimulationPackingList.py +++ b/product/ERP5Legacy/tests/testLegacySimulationPackingList.py @@ -34,7 +34,7 @@ from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod from Products.ERP5Type.Document.BusinessTemplate import getChainByType from zLOG import LOG from Products.ERP5Type.tests.Sequence import SequenceList -from testOrder import TestOrderMixin +from testLegacyRuleOrder import TestOrderMixin from DateTime import DateTime from Products.ERP5Type.Globals import PersistentMapping