diff --git a/product/ERP5/tests/testImmobilisation.py b/product/ERP5/tests/testImmobilisation.py index 9935f114749b7466cbc6033adc65283adfd90fee..5cbe36dd7a71d7df46f5d6bdfaeaff22da753afc 100644 --- a/product/ERP5/tests/testImmobilisation.py +++ b/product/ERP5/tests/testImmobilisation.py @@ -36,6 +36,7 @@ from Products.ERP5Type.tests.Sequence import SequenceList from DateTime import DateTime from zLOG import LOG from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD +from Products.ERP5.tests.utils import newSimulationExpectedFailure class TestImmobilisationMixin(ERP5TypeTestCase): @@ -3617,8 +3618,8 @@ class TestImmobilisation(TestImmobilisationMixin): 'group/group A', preferred_accounting_transaction_currency=\ 'currency_module/EUR') - wf_tool = self.getWorkflowTool() - wf_tool.doActionFor(preference,'enable_action',wf_id='preference_workflow') + if preference.getPreferenceState() == 'disabled': + preference.enable() transaction.commit() self.tic() # Now we can check several Accounting methods @@ -3636,6 +3637,7 @@ class TestImmobilisation(TestImmobilisationMixin): self.assertEquals(5000.0,account.AccountModule_getTotalSourceDebit(brain=account)) self.assertEquals(0.0,account.AccountModule_getTotalSourceCredit(brain=account)) + @newSimulationExpectedFailure def test_19_TestAccountingBuildingAndDivergence(self, quiet=0, run=run_all_test): if not run: return if not quiet: @@ -3729,6 +3731,7 @@ class TestImmobilisation(TestImmobilisationMixin): parameter_dict = parameter_dict, destination_section = self.getOrganisationModule()["A"]) + @newSimulationExpectedFailure def test_20_TestAccountingAcceptDecisionSolver(self, quiet=0, run=run_all_test): if not run: return if not quiet: diff --git a/product/ERP5Legacy/tests/testLegacyImmobilisation.py b/product/ERP5Legacy/tests/testLegacyImmobilisation.py new file mode 100644 index 0000000000000000000000000000000000000000..ae2c5ed1cce6d5387fca176ac1d858c7775a86a4 --- /dev/null +++ b/product/ERP5Legacy/tests/testLegacyImmobilisation.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +############################################################################## +# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved. +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsibility 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 +# guarantees and support are strongly advised 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################## + +from Products.ERP5Legacy.tests import Legacy_getBusinessTemplateList +from Products.ERP5.tests.testImmobilisation import * + +Legacy_getBusinessTemplateList(TestImmobilisationMixin)