diff --git a/product/ERP5Banking/tests/testERP5BankingCashInventory.py b/product/ERP5Banking/tests/testERP5BankingCashInventory.py
index 12916463f278782890f994535d4cd9143ba9f034..792c62e74794556dead88338542f99c9d0d174d2 100755
--- a/product/ERP5Banking/tests/testERP5BankingCashInventory.py
+++ b/product/ERP5Banking/tests/testERP5BankingCashInventory.py
@@ -105,8 +105,8 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     on are really here.
     """
     # check that Categories were created
-    self.assertEqual(self.caisse_1.getPortalType(), 'Category')
-    self.assertEqual(self.caisse_2.getPortalType(), 'Category')
+    self.assertEqual(self.paris.getPortalType(), 'Category')
+    self.assertEqual(self.madrid.getPortalType(), 'Category')
 
     # check that Resources were created
     # check portal type of billet_10000
@@ -148,14 +148,14 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     self.simulation_tool = self.getSimulationTool()
     # check we have 0 banknotes of 10000 in caisse_1
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
     # check we have 0 coin of 200 in caisse_1
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
     # check we have 0 banknotes of 5000 in caisse_1
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
 
 
   def stepCreateCashInventoryGroup(self, sequence=None, sequence_list=None, **kwd):
@@ -163,7 +163,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     Create a cash inventory document and check it
     """
     # Cash inventory has caisse_1 for source, caisse_2 for destination, and a price cooreponding to the sum of banknote of 10000 abd coin of 200 ( (2+3) * 1000 + (5+7) * 200 )
-    self.cash_inventory_group = self.cash_inventory_module.newContent(id='cash_inventory_group', portal_type='Cash Inventory Group', source_value=None, destination_value=self.caisse_1)
+    self.cash_inventory_group = self.cash_inventory_module.newContent(id='cash_inventory_group', portal_type='Cash Inventory Group', source_value=None, destination_value=self.paris)
     # execute tic
     self.stepTic()
     # check we have only one cash inventory
@@ -175,7 +175,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     # check that its source is caisse_1
     self.assertEqual(self.cash_inventory.getSource(), None)
     # check that its destination is caisse_2
-    self.assertEqual(self.cash_inventory.getDestination(), 'site/testsite/caisse_1')
+    self.assertEqual(self.cash_inventory.getDestination(), 'site/testsite/paris')
 
 
   def stepCreateCashInventory(self, sequence=None, sequence_list=None, **kwd):
@@ -195,7 +195,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     # check that its source is caisse_1
     self.assertEqual(self.cash_inventory.getSource(), None)
     # check that its destination is caisse_2
-    self.assertEqual(self.cash_inventory.getDestination(), 'site/testsite/caisse_1')
+    self.assertEqual(self.cash_inventory.getDestination(), 'site/testsite/paris')
 
 
   def stepCreateInventoryLine1(self, sequence=None, sequence_list=None, **kwd):
@@ -204,7 +204,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     # create the cash inventory
     self.addCashLineToDelivery(self.cash_inventory, 'valid_line_1', 'Cash Inventory Line', self.billet_10000,
-            ('emission_letter', 'cash_status', 'variation'), ('emission_letter/k', 'cash_status/valid') + self.variation_list,
+            ('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/valid') + self.variation_list,
             self.quantity_10000)
     # execute tic
     self.stepTic()
@@ -225,7 +225,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     # now check for each variation (years 1992 and 2003)
     for variation in self.variation_list:
       # get the delivery cell
-      cell = self.valid_line_1.getCell('emission_letter/k', variation, 'cash_status/valid')
+      cell = self.valid_line_1.getCell('emission_letter/p', variation, 'cash_status/valid')
       # chek portal types
       self.assertEqual(cell.getPortalType(), 'Cash Inventory Cell')
       # check the banknote of the cell is banknote of 10000
@@ -233,7 +233,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
       # check the source vault is caisse_1
       self.assertEqual(cell.getSourceValue(), None)
       # check the destination vault is caisse_2
-      self.assertEqual(cell.getDestinationValue(), self.caisse_1)
+      self.assertEqual(cell.getDestinationValue(), self.paris)
       if cell.getId() == 'movement_0_0_0':
         # check the quantity of banknote for year 1992 is 2
         self.assertEqual(cell.getQuantity(), 2.0)
@@ -259,8 +259,8 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     Check that compution of inventory at vault caisse_2 is right after confirm and before deliver
     """
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
 
     
   def stepCreateInventoryLine2(self, sequence=None, sequence_list=None, **kwd):
@@ -269,7 +269,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     # create the line
     self.addCashLineToDelivery(self.cash_inventory, 'valid_line_2', 'Cash Inventory Line', self.piece_200,
-            ('emission_letter', 'cash_status', 'variation'), ('emission_letter/k', 'cash_status/valid') + self.variation_list,
+            ('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/valid') + self.variation_list,
             self.quantity_200)
     # execute tic
     self.stepTic()
@@ -289,7 +289,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     self.assertEqual(len(self.valid_line_2.objectValues()), 2)
     for variation in self.variation_list:
       # get the delivery  cell
-      cell = self.valid_line_2.getCell('emission_letter/k', variation, 'cash_status/valid')
+      cell = self.valid_line_2.getCell('emission_letter/p', variation, 'cash_status/valid')
       # check the portal type
       self.assertEqual(cell.getPortalType(), 'Cash Inventory Cell')
       # check the banknote of the cell is banknote of 10000
@@ -297,7 +297,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
       # check the source vault is caisse_1
       self.assertEqual(cell.getSourceValue(), None)
       # check the destination vault is caisse_2
-      self.assertEqual(cell.getDestinationValue(), self.caisse_1)
+      self.assertEqual(cell.getDestinationValue(), self.paris)
       if cell.getId() == 'movement_0_0_0':
         # check the quantity for coin for year 1992 is 5
         self.assertEqual(cell.getQuantity(), 5.0)
@@ -324,8 +324,8 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     Check that compution of inventory at vault caisse_2 is right after confirm and before deliver
     """
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
 
 
   def stepCreateInventoryLine3(self, sequence=None, sequence_list=None, **kwd):
@@ -336,7 +336,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     # create a line in which quanity of banknotes of 5000 is higher that quantity available at source
     # here create a line with 24 (11+13) banknotes of 500 although the vault caisse_1 has no banknote of 5000
     self.addCashLineToDelivery(self.cash_inventory, 'valid_line_3', 'Cash Inventory Line', self.billet_5000,
-            ('emission_letter', 'cash_status', 'variation'), ('emission_letter/k', 'cash_status/valid') + self.variation_list,
+            ('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/valid') + self.variation_list,
             self.quantity_5000)
     # execute tic
     self.stepTic()
@@ -356,7 +356,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     self.assertEqual(len(self.valid_line_3.objectValues()), 2)
     for variation in self.variation_list:
       # get the delivery  cell
-      cell = self.valid_line_3.getCell('emission_letter/k', variation, 'cash_status/valid')
+      cell = self.valid_line_3.getCell('emission_letter/p', variation, 'cash_status/valid')
       # check the portal type
       self.assertEqual(cell.getPortalType(), 'Cash Inventory Cell')
       # check the banknote of the cell is banknote of 10000
@@ -364,7 +364,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
       # check the source vault is caisse_1
       self.assertEqual(cell.getSourceValue(), None)
       # check the destination vault is caisse_2
-      self.assertEqual(cell.getDestinationValue(), self.caisse_1)
+      self.assertEqual(cell.getDestinationValue(), self.paris)
       if cell.getId() == 'movement_0_0_0':
         # check the quantity for coin for year 1992 is 5
         self.assertEqual(cell.getQuantity(), 11.0)
@@ -390,14 +390,14 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     Check that compution of inventory at vault caisse_2 is right after confirm and before deliver
     """
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
     
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
 
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.caisse_1.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.paris.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.paris.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
 
   ##################################
   ##  Tests
diff --git a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py
index 590b93d1360da534a0d85630aad966e5293da9ad..ebf1aa8c1f618ce8cabfd8c36811847551adcce5 100755
--- a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py
+++ b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py
@@ -104,26 +104,26 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
     inventory_dict_line_1 = {'id' : 'inventory_line_1',
                              'resource': self.billet_10000,
                              'variation_id': ('emission_letter', 'cash_status', 'variation'),
-                             'variation_value': ('emission_letter/k', 'cash_status/to_sort') + self.variation_list,
+                             'variation_value': ('emission_letter/p', 'cash_status/valid') + self.variation_list,
                              'quantity': self.quantity_10000}
     
     inventory_dict_line_2 = {'id' : 'inventory_line_2',
                              'resource': self.billet_200,
                              'variation_id': ('emission_letter', 'cash_status', 'variation'),
-                             'variation_value': ('emission_letter/k', 'cash_status/to_sort') + self.variation_list,
+                             'variation_value': ('emission_letter/p', 'cash_status/valid') + self.variation_list,
                              'quantity': self.quantity_200}
 
     inventory_dict_line_3 = {'id' : 'inventory_line_3',
                              'resource': self.billet_5000,
                              'variation_id': ('emission_letter', 'cash_status', 'variation'),
-                             'variation_value': ('emission_letter/k', 'cash_status/to_sort') + self.variation_list,
+                             'variation_value': ('emission_letter/p', 'cash_status/valid') + self.variation_list,
                              'quantity': self.quantity_5000}
     
     line_list = [inventory_dict_line_1, inventory_dict_line_2, inventory_dict_line_3]
-
-    self.createCashInventory(source=None, destination=self.encaisse_billets_et_monnaies, currency=self.currency_1,
+    self.bi_counter = self.paris.surface.banque_interne.guichet_1
+    self.createCashInventory(source=None, destination=self.bi_counter, currency=self.currency_1,
                              line_list=line_list)
-
+    self.stepTic()
     # create a person and a bank account
     self.person_1 = self.createPerson(id='person_1',
                                       first_name='toto',
@@ -135,7 +135,7 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
 
     # create a check
     self.checkbook_1 = self.createCheckbook(id= 'checkbook_1',
-                                            vault=self.paris,
+                                            vault=self.bi_counter,
                                             bank_account=self.bank_account_1,
                                             min=50,
                                             max=100,                                            
@@ -146,18 +146,18 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
                                     checkbook=self.checkbook_1)
     
     # open counter date and counter
-    self.openCounterDate()
-    self.openCounter(site=self.testsite)
+    self.openCounterDate(site=self.paris)
+    self.openCounter(site=self.bi_counter)
     
     # 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
     self.checkUserFolderType()
     self.organisation = self.organisation_module.newContent(id='baobab_org', portal_type='Organisation',
-                          function='banking', group='baobab',  site='testsite')
+                          function='banking', group='baobab',  site='testsite/paris')
     # define the user
     user_dict = {
-        'super_user' : [['Manager'], self.organisation, 'banking/comptable', 'baobab', 'testsite']
+        'super_user' : [['Manager'], self.organisation, 'banking/comptable', 'baobab', 'testsite/paris']
       }
     # call method to create this user
     self.createERP5Users(user_dict)
@@ -184,14 +184,14 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     self.simulation_tool = self.getSimulationTool()
     # check we have 5 banknotes of 10000 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
     # check we have 12 coin of 200 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
     # check we have 24 banknotes of 200 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
     # check the inventory of the bank account
     self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl()), 100000)
     self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl()), 100000)
@@ -206,17 +206,17 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
                                          # aggregate_value = self.check_1,
                                          resource_value = self.currency_1,
                                          aggregate_free_text = "50",
-                                         # source_value = self.encaisse_billets_et_monnaies,
+                                         # source_value = self.bi_counter,
                                          start_date = DateTime().Date(),
                                          source_total_asset_price = 20000.0)
     # call set source to go into the interaction workflow to update local roles
-    self.check_payment._setSource(self.encaisse_billets_et_monnaies.getRelativeUrl())
+    self.check_payment._setSource(self.bi_counter.getRelativeUrl())
     self.assertNotEqual(self.check_payment, None)
     self.assertEqual(self.check_payment.getTotalPrice(), 0.0)
     self.assertEqual(self.check_payment.getDestinationPayment(), self.bank_account_1.getRelativeUrl())
     self.assertEqual(self.check_payment.getAggregateFreeText(), self.check_1.getReference())
     self.assertEqual(self.check_payment.getSourceTotalAssetPrice(), 20000.0)
-    self.assertEqual(self.check_payment.getSource(), self.encaisse_billets_et_monnaies.getRelativeUrl())
+    self.assertEqual(self.check_payment.getSource(), self.bi_counter.getRelativeUrl())
 
     # the initial state must be draft
     self.assertEqual(self.check_payment.getSimulationState(), 'draft')
@@ -255,14 +255,14 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     self.simulation_tool = self.getSimulationTool()
     # check we have 5 banknotes of 10000 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
     # check we have 12 coin of 200 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
     # check we have 24 banknotes of 200 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
     # check the inventory of the bank account, must be planned to be decrease by 20000
     self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl()), 100000)
     self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl()), 80000)
@@ -274,13 +274,13 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     self.addCashLineToDelivery(self.check_payment, 'line_1', 'Cash Delivery Line', self.billet_10000,
             ('emission_letter', 'cash_status', 'variation'),
-            ('emission_letter/k', 'cash_status/to_sort') + self.variation_list[1:],
+            ('emission_letter/p', 'cash_status/valid') + self.variation_list[1:],
             {self.variation_list[1] : 1})
     self.assertEqual(self.check_payment.line_1.getPrice(), 10000)
 
     self.addCashLineToDelivery(self.check_payment, 'line_2', 'Cash Delivery Line', self.billet_5000,
             ('emission_letter', 'cash_status', 'variation'),
-            ('emission_letter/k', 'cash_status/to_sort') + self.variation_list[1:],
+            ('emission_letter/p', 'cash_status/valid') + self.variation_list[1:],
             {self.variation_list[1] : 2})
     self.assertEqual(self.check_payment.line_2.getPrice(), 5000)
 
@@ -302,14 +302,14 @@ class TestERP5BankingCheckPayment(TestERP5BankingMixin, ERP5TypeTestCase):
     """
     self.simulation_tool = self.getSimulationTool()
     # check we have 5 banknotes of 10000 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 4.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 4.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 4.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 4.0)
     # check we have 12 coin of 200 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
     # check we have 24 banknotes of 200 in encaisse_billets_et_monnaies
-    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 22.0)
-    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_billets_et_monnaies.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 22.0)
+    self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 22.0)
+    self.assertEqual(self.simulation_tool.getFutureInventory(node=self.bi_counter.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 22.0)
     # check the final inventory of the bank account
     self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl()), 80000)
     self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl()), 80000)