diff --git a/product/ERP5Banking/tests/testERP5BankingCashExchange.py b/product/ERP5Banking/tests/testERP5BankingCashExchange.py index e42760890039f8fe098370ae74d03d407be79a1f..8680c9ceefcc5a1950c99e14dc4c5c3d27d3a65e 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashExchange.py +++ b/product/ERP5Banking/tests/testERP5BankingCashExchange.py @@ -163,10 +163,6 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): self.createCashInventory(source=self.guichet_2, destination=self.guichet_2, currency=self.currency_1, line_list=line_list_guichet_2) - - # open counter date and counter - self.openCounterDate(site=self.paris.surface.banque_interne.guichet_1.encaisse_des_billets_et_monnaies.sortante) - # now we need to create a user as Manager to do the test # in order to have an assigment defined which is used to do transition # Create an Organisation that will be used for users assignment @@ -182,6 +178,8 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): self.logout() self.login('super_user') + # open counter date and counter + self.openCounterDate(site=self.paris.surface.banque_interne.guichet_1.encaisse_des_billets_et_monnaies.sortante) def stepCheckObjects(self, sequence=None, sequence_list=None, **kwd): diff --git a/product/ERP5Banking/tests/testERP5BankingCashIncident.py b/product/ERP5Banking/tests/testERP5BankingCashIncident.py index 8965944fb3d422aeefb35ea1531a0f7b3d9261c8..3068f4d51d050f3a3bcd5d020e56b53b90f62206 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashIncident.py +++ b/product/ERP5Banking/tests/testERP5BankingCashIncident.py @@ -143,9 +143,9 @@ class TestERP5BankingCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): } # call method to create this user self.createERP5Users(user_dict) - self.openCounterDate(site=self.paris) self.logout() self.login('super_user') + self.openCounterDate(site=self.paris) def stepCheckObjects(self, sequence=None, sequence_list=None, **kwd): diff --git a/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py b/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py index 3c31885d12d2a3b0d2957cb425635b3d20380a7b..abee01aba8d2548cb3198aa83c867f801132e17b 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py +++ b/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py @@ -151,10 +151,6 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCa self.createCashInventory(source=None, destination=self.guichet_sortante, currency=self.currency_1, line_list=line_list_sortante) - - # open counter date and counter - self.openCounterDate(site=self.paris.surface.banque_interne.guichet_1.encaisse_des_billets_et_monnaies.sortante) - # now we need to create a user as Manager to do the test # in order to have an assigment defined which is used to do transition # Create an Organisation that will be used for users assignment @@ -169,6 +165,8 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCa self.createERP5Users(user_dict) self.logout() self.login('super_user') + # open counter date and counter + self.openCounterDate(site=self.paris.surface.banque_interne.guichet_1.encaisse_des_billets_et_monnaies.sortante) diff --git a/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py b/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py index 37f4102da73dbd37fa85b0dfd00d44c6b7edc69c..e0ebe44fdbe6fbf38798167392c2aceac185599f 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py +++ b/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py @@ -141,10 +141,6 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase): self.createCashInventory(source=None, destination=self.guichet_sortante, currency=self.currency_2, line_list=line_list_sortante) - - # open counter date and counter - self.openCounterDate(site=self.paris.surface.banque_interne.guichet_1) - # now we need to create a user as Manager to do the test # in order to have an assigment defined which is used to do transition # Create an Organisation that will be used for users assignment @@ -159,6 +155,8 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase): self.createERP5Users(user_dict) self.logout() self.login('super_user') + # open counter date and counter + self.openCounterDate(site=self.paris.surface.banque_interne.guichet_1) diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py b/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py index c9a6de6a700266eab321d0f4040e33554549715a..51de7c55189ea4b2315b71c7aec32b296431d73d 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py @@ -120,10 +120,10 @@ class TestERP5BankingCheckbookDeliveryMixin: account_id='bank_account_1', currency=self.currency_1, amount=100000) - # open counter date and counter - self.openCounterDate(site=self.paris) self.logout() self.login('super_user') + # open counter date and counter + self.openCounterDate(site=self.paris) # this is required in order to have some items # in the source self.createCheckbookReception() diff --git a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py index d5511b6fb8ae191b54a74ef05c9a6d1be2fa3552..0fc069073e161186d7aeb0c34026c1b04a68b8c0 100755 --- a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py +++ b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py @@ -116,9 +116,9 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase } # call method to create this user self.createERP5Users(user_dict) - self.openCounterDate(site=self.paris) self.logout() self.login('super_user') + self.openCounterDate(site=self.paris) def stepCheckObjects(self, sequence=None, sequence_list=None, **kwd): diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py b/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py index d84df8881cc450f9a6c8ca2032d5c5777c82c76b..a3ac3513f726b2952be0f8f9ab3bf959ad26f0c0 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py @@ -187,9 +187,9 @@ class TestERP5BankingMonetaryIssue(TestERP5BankingMonetaryReceptionMixin, TestER } # call method to create this user self.createERP5Users(user_dict) - self.openCounterDate(site=self.paris) self.logout() self.login('super_user') + self.openCounterDate(site=self.paris) # this is required in order to have some items # in the source diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py b/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py index 4efa0eb7759ebf133460d566ec2a3a6701d615ba..34c40a67c7300d4797c3dfefc3a696c10754687e 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py @@ -114,9 +114,9 @@ class TestERP5BankingMonetaryReception(TestERP5BankingMixin, ERP5TypeTestCase): } # call method to create this user self.createERP5Users(user_dict) - self.openCounterDate(site=self.paris) self.logout() self.login('super_user') + self.openCounterDate(site=self.paris) def stepCheckObjects(self, sequence=None, sequence_list=None, **kwd): diff --git a/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py b/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py index bec0c4851c4d5a27e9024a0729e9338b1d902472..08982e02716b4fd9119ba236e3b82cf2da8626db 100755 --- a/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py +++ b/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py @@ -107,8 +107,6 @@ class TestERP5BankingMutilatedBanknote(TestERP5BankingMixin, ERP5TypeTestCase): self.hq_mutilated_banknote_vault = self.siege.surface.caisse_courante.billets_mutiles self.hq_usual_vault = self.siege.surface.caisse_courante.encaisse_des_billets_et_monnaies - self.openCounterDate(site=self.paris) - self.openCounterDate(site=self.siege, id='counter_date_2') self.createCashInventory(source=None, destination=self.usual_vault, currency=self.currency_1, line_list=line_list) self.createCashInventory(source=None, destination=self.hq_usual_vault, currency=self.currency_1, @@ -130,6 +128,8 @@ class TestERP5BankingMutilatedBanknote(TestERP5BankingMixin, ERP5TypeTestCase): self.createERP5Users(user_dict) self.logout() self.login('super_user') + self.openCounterDate(site=self.paris) + self.openCounterDate(site=self.siege, id='counter_date_2') def stepCheckObjects(self, sequence=None, sequence_list=None, **kwd): diff --git a/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py b/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py index 04fb336ed346ff7b414287731b73b46eaca25f58..799d81d33fc0a2c784a1f8f7027987b8ac4f0f42 100755 --- a/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py +++ b/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py @@ -131,8 +131,6 @@ class TestERP5BankingUsualCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): self.createBanknotesAndCoins() self.usual_cash = self.paris.surface.caisse_courante.encaisse_des_billets_et_monnaies - # open counter date and counter - self.openCounterDate(site=self.paris) # now we need to create a user as Manager to do the test # in order to have an assigment defined which is used to do transition # Create an Organisation that will be used for users assignment @@ -147,6 +145,8 @@ class TestERP5BankingUsualCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): self.createERP5Users(user_dict) self.logout() self.login('super_user') + # open counter date and counter + self.openCounterDate(site=self.paris) def stepCheckObjects(self, sequence=None, sequence_list=None, **kwd):