Commit r30689 broke ERP5Banking tests because currency might not be created...

Commit r30689 broke ERP5Banking tests because currency might not be created before bank accounts are created.
So make createFunctionGroupSiteCategory call createBanknotesAndCoins, and remove all other calls to this method.


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

product/ERP5Banking/tests/TestERP5BankingMixin.py

@@ -333,7 +333,7 @@ class TestERP5BankingMixin(ERP5TypeTestCase):
 
       
 
-  def createBanknotesAndCoins(self):
+  def _createBanknotesAndCoins(self):
     """
     Create some banknotes and coins
     """
@@ -487,6 +487,9 @@ class TestERP5BankingMixin(ERP5TypeTestCase):
     """
     if site_list is None:
       site_list = ["paris", 'madrid', 'siege']
+
+    self._createBanknotesAndCoins()
+
     # add category unit in quantity_unit which is the unit that will be used for banknotes and coins
     self.variation_base_category = getattr(self.category_tool, 'quantity_unit')
     self.unit = self.variation_base_category.newContent(id='unit', title='Unit')

product/ERP5Banking/tests/testERP5BankingAccountingCancellation.py

@@ -87,9 +87,6 @@ class TestERP5BankingAccountingCancellation(TestERP5BankingMixin):
 
     self.createFunctionGroupSiteCategory(site_list=['paris'])
 
-    # Create currencies
-    self.createBanknotesAndCoins()
-
     self.stepTic()
     # create a person and a bank account
     self.person_1 = self.createPerson(id='person_1',

product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py

@@ -98,7 +98,6 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 5000.

product/ERP5Banking/tests/testERP5BankingCashClassification.py

@@ -77,7 +77,6 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory(site_list=('paris',))
-    self.createBanknotesAndCoins()
 
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingCashExchange.py

@@ -99,7 +99,6 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 200.

product/ERP5Banking/tests/testERP5BankingCashInventory.py

@@ -78,7 +78,6 @@ class TestERP5BankingInventory(TestERP5BankingMixin):
 
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
     # do everything as manager, as no roles are defined for inventory
 
 

product/ERP5Banking/tests/testERP5BankingCashMovement.py

@@ -121,9 +121,6 @@ class TestERP5BankingCashMovement(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory(site_list=['paris','madrid'])
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingCashMovementNewNotEmitted.py

@@ -80,9 +80,6 @@ class TestERP5BankingCashMovementNewNotEmitted(TestERP5BankingMonetaryReceptionM
     # create categories
     self.createFunctionGroupSiteCategory(site_list=['paris','madrid'])
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     self.vault_source = self.paris.caveau.serre.encaisse_des_billets_neufs_non_emis_en_transit_allant_a.madrid

product/ERP5Banking/tests/testERP5BankingCashSorting.py

@@ -77,8 +77,6 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
-
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',
                              'resource': self.billet_10000,

product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py

@@ -99,7 +99,6 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 200.

product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py

@@ -98,7 +98,6 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 200.

product/ERP5Banking/tests/testERP5BankingCheckDeposit.py

@@ -81,8 +81,6 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin):
     self.createManagerAndLogin()
     # create categories
     self.createFunctionGroupSiteCategory(site_list=['paris',])
-    # create resources
-    self.createBanknotesAndCoins()
     # define the user, a site is needed for accouting event
     self.checkUserFolderType()
     self.organisation = self.organisation_module.newContent(id='baobab_org', portal_type='Organisation',

product/ERP5Banking/tests/testERP5BankingCheckPayment.py

@@ -80,7 +80,6 @@ class TestERP5BankingCheckPaymentMixin(TestERP5BankingMixin):
     self.variation_list = ('variation/1992', 'variation/2003')
 
     self.createFunctionGroupSiteCategory(site_list=['paris'])
-    self.createBanknotesAndCoins()
 
     # Before the test, we need to input the inventory
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py

@@ -84,7 +84,6 @@ class TestERP5BankingCheckbookDeliveryMixin(TestERP5BankingMixin):
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory()
     self.createCheckAndCheckbookModel()
-    self.createBanknotesAndCoins()
     self.vault_transfer_source_site = self.paris.caveau
     self.vault_transfer_destination_site = self.paris.surface
     self.source_site = self.paris.surface.caisse_courante

product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py

@@ -82,7 +82,6 @@ class TestERP5BankingCheckbookMovement(TestERP5BankingCheckbookVaultTransferMixi
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory(site_list=['paris','madrid'])
     self.createCheckAndCheckbookModel()
-    self.createBanknotesAndCoins()
     self.reception_destination_site = self.paris
     self.source_site = self.paris
     self.destination_site = self.madrid

product/ERP5Banking/tests/testERP5BankingCheckbookReception.py

@@ -80,7 +80,6 @@ class TestERP5BankingCheckbookReception(TestERP5BankingMixin):
 
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
     self.traveler_check_model = self.createTravelerCheckModel('traveler_check_model')
     self.createCheckAndCheckbookModel()
     self.reception = self.paris.caveau.auxiliaire.encaisse_des_billets_et_monnaies

product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py

@@ -142,7 +142,6 @@ class TestERP5BankingCheckbookUsualCashTransfer(TestERP5BankingCheckbookUsualCas
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory()
     self.createCheckAndCheckbookModel()
-    self.createBanknotesAndCoins()
     self.vault_transfer_source_site = self.paris.caveau
     self.vault_transfer_destination_site = self.paris.surface
     self.source_site = self.paris.surface.caisse_courante

product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py

@@ -183,7 +183,6 @@ class TestERP5BankingCheckbookVaultTransfer(TestERP5BankingCheckbookVaultTransfe
     self.createFunctionGroupSiteCategory()
     self.createCheckAndCheckbookModel()
     self.destination_site = self.paris
-    self.createBanknotesAndCoins()
     self.reception_destination_site = self.paris
     self.source_site = self.paris.caveau
     self.destination_site = self.paris.surface

product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py

@@ -77,8 +77,6 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
-
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',
                              'resource': self.billet_10000,

product/ERP5Banking/tests/testERP5BankingCounterRendering.py

@@ -110,9 +110,6 @@ class TestERP5BankingCounterRendering(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py

@@ -83,9 +83,6 @@ class TestERP5BankingDestructionSurvey(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingForeignCashReception.py

@@ -86,7 +86,6 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin):
 
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
     self.reception = self.paris.caveau.auxiliaire.encaisse_des_devises.usd
     self.checkUserFolderType()
     self.organisation = self.organisation_module.newContent(id='baobab_org', portal_type='Organisation',

product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py

@@ -77,7 +77,6 @@ class TestERP5BankingInternalMoneyDeposit(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 200.

product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py

@@ -77,7 +77,6 @@ class TestERP5BankingInternalMoneyPayment(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory()
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 200.

product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py

@@ -111,9 +111,6 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory(site_list=['paris','madrid', ('lyon', 'P11', 'testsite/auxiliaire')])
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
     
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py

@@ -154,7 +154,6 @@ class TestERP5BankingMonetaryIssue(TestERP5BankingMonetaryReceptionMixin):
     self.current_date = DateTime()
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory(site_list=['paris',])
-    self.createBanknotesAndCoins()
     self.issue = self.paris.caveau.reserve.encaisse_des_billets_et_monnaies
     self.reception = self.paris.caveau.serre.encaisse_des_billets_neufs_non_emis
     self.reception_site = self.reception

product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py

@@ -110,9 +110,6 @@ class TestERP5BankingMonetaryRecall(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
     inventory_dict_line_1 = {'id' : 'inventory_line_1',
                              'resource': self.billet_10000,

product/ERP5Banking/tests/testERP5BankingMonetaryReception.py

@@ -84,7 +84,6 @@ class TestERP5BankingMonetaryReception(TestERP5BankingMixin):
 
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory(site_list=['paris',])
-    self.createBanknotesAndCoins()
     self.reception = self.paris.caveau.serre.encaisse_des_billets_neufs_non_emis
     self.checkUserFolderType()
     self.organisation = self.organisation_module.newContent(id='baobab_org', portal_type='Organisation',

product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py

@@ -80,9 +80,6 @@ class TestERP5BankingMonetarySurvey(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingMoneyDeposit.py

@@ -81,7 +81,6 @@ class TestERP5BankingMoneyDepositMixin(TestERP5BankingMixin):
     self.createManagerAndLogin()
 
     self.createFunctionGroupSiteCategory(site_list=['paris',])
-    self.createBanknotesAndCoins()
 
     """
     Windows to create the BANKNOTES of 10 000 and 5000, coins 200.

product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py

@@ -110,9 +110,6 @@ class TestERP5BankingMoneyDepositRendering(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py

@@ -76,8 +76,6 @@ class TestERP5BankingMutilatedBanknote(TestERP5BankingMixin):
     self.createManagerAndLogin()
     # create categories
     self.createFunctionGroupSiteCategory(site_list = ['siege', 'paris'])
-    # create resources
-    self.createBanknotesAndCoins()
     # Before the test, we need to input the inventory
     inventory_dict_line_1 = {'id' : 'inventory_line_1',
                              'resource': self.billet_10000,

product/ERP5Banking/tests/testERP5BankingTravelerCheckSale.py

@@ -117,7 +117,6 @@ class TestERP5BankingTravelerCheckSaleMixin(TestERP5BankingMixin):
     self.createManagerAndLogin()
     self.createFunctionGroupSiteCategory()
     self.createCheckAndCheckbookModel()
-    self.createBanknotesAndCoins()
     self.vault_transfer_source_site = self.paris.caveau
     self.vault_transfer_destination_site = self.paris.surface
     self.source_site = self.paris.surface.caisse_courante

product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py

@@ -122,9 +122,6 @@ class TestERP5BankingUsualCashRendering(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py

@@ -110,9 +110,6 @@ class TestERP5BankingUsualCashTransfer(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',

product/ERP5Banking/tests/testERP5BankingVaultTransfer.py

@@ -122,9 +122,6 @@ class TestERP5BankingVaultTransfer(TestERP5BankingMixin):
     # create categories
     self.createFunctionGroupSiteCategory()
 
-    # create resources
-    self.createBanknotesAndCoins()
-
     # Before the test, we need to input the inventory
 
     inventory_dict_line_1 = {'id' : 'inventory_line_1',