replace salle_de_tri by salle_tri

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

product/ERP5Banking/tests/testERP5BankingCashClassification.py

@@ -117,7 +117,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase):
 
 
     line_list = [inventory_dict_line_1, inventory_dict_line_2, inventory_dict_line_3]
-    self.encaisse_tri = self.paris.surface.salle_de_tri.encaisse_des_billets_recus_pour_ventilation.Spain
+    self.encaisse_tri = self.paris.surface.salle_tri.encaisse_des_billets_recus_pour_ventilation.Spain
     self.encaisse_reserve = self.paris.caveau.reserve.encaisse_des_billets_et_monnaies
     self.encaisse_externe = self.paris.caveau.externes.encaisse_des_externes
     self.encaisse_auxiliaire = self.paris.caveau.auxiliaire.encaisse_des_billets_recus_pour_ventilation.Spain
@@ -228,7 +228,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase):
     # check its portal type
     self.assertEqual(self.cash_sorting.getPortalType(), 'Cash Sorting')
     # check that its source is encaisse_paris
-    self.assertEqual(self.cash_sorting.getSource(), 'site/testsite/paris/surface/salle_de_tri/encaisse_des_billets_recus_pour_ventilation/Spain')
+    self.assertEqual(self.cash_sorting.getSource(), 'site/testsite/paris/surface/salle_tri/encaisse_des_billets_recus_pour_ventilation/Spain')
     # check that its destination is encaisse_externe
     self.assertEqual(self.cash_sorting.getDestination(), None)
 

product/ERP5Banking/tests/testERP5BankingCashSorting.py

@@ -74,7 +74,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
            , 'erp5_banking_inventory'
            , 'erp5_banking_cash' # erp5_banking_cash contains all method for cash sorting
            )
-  
+
   def getCashSortingModule(self):
     """
     Return the Cash Sorting Module
@@ -87,7 +87,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
       Method called before the launch of the test to initialize some data
     """
     self.initDefaultVariable()
-    # Set some variables : 
+    # Set some variables :
     self.cash_sorting_module = self.getCashSortingModule()
 
     # Create a user and login as manager to populate the erp5 portal with objects for tests.
@@ -102,7 +102,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
                              'variation_id': ('emission_letter', 'cash_status', 'variation'),
                              'variation_value': ('emission_letter/not_defined', 'cash_status/to_sort') + 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'),
@@ -115,13 +115,13 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
                              'variation_value': ('emission_letter/not_defined', 'cash_status/to_sort') + self.variation_list,
                              'quantity': self.quantity_5000}
 
-    
+
     line_list = [inventory_dict_line_1, inventory_dict_line_2, inventory_dict_line_3]
-    self.encaisse_tri = self.paris.surface.salle_de_tri.encaisse_des_billets_et_monnaies
+    self.encaisse_tri = self.paris.surface.salle_tri.encaisse_des_billets_et_monnaies
     self.encaisse_reserve = self.paris.caveau.reserve.encaisse_des_billets_et_monnaies
     self.encaisse_externe = self.paris.caveau.externes.encaisse_des_externes
     self.encaisse_auxiliaire = self.paris.caveau.auxiliaire.encaisse_des_billets_et_monnaies
-    
+
     self.createCashInventory(source=None, destination=self.encaisse_tri, currency=self.currency_1,
                              line_list=line_list)
 
@@ -182,7 +182,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
     self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_tri.getRelativeUrl(), resource = self.billet_200.getRelativeUrl()), 12.0)
     self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_tri.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
     self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_tri.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0)
-    
+
 
   def stepCheckDestination(self, sequence=None, sequence_list=None, **kwd):
     """
@@ -211,7 +211,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
     self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_externe.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
     self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_auxiliaire.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
     self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_auxiliaire.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 0.0)
-    
+
 
   def stepCreateCashSorting(self, sequence=None, sequence_list=None, **kwd):
     """
@@ -228,7 +228,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
     # check its portal type
     self.assertEqual(self.cash_sorting.getPortalType(), 'Cash Sorting')
     # check that its source is encaisse_paris
-    self.assertEqual(self.cash_sorting.getSource(), 'site/testsite/paris/surface/salle_de_tri/encaisse_des_billets_et_monnaies')
+    self.assertEqual(self.cash_sorting.getSource(), 'site/testsite/paris/surface/salle_tri/encaisse_des_billets_et_monnaies')
     # check that its destination is encaisse_externe
     self.assertEqual(self.cash_sorting.getDestination(), None)
 
@@ -540,7 +540,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
 
   def stepCheckSourceDebitPlanned(self, sequence=None, sequence_list=None, **kwd):
     """
-    Check that compution of inventory at vault encaisse_paris is right after confirm and before deliver 
+    Check that compution of inventory at vault encaisse_paris is right after confirm and before deliver
     """
     # check we have 5 banknotes of 10000 currently
     self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_tri.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
@@ -592,7 +592,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
     workflow_history = self.workflow_tool.getInfoFor(ob=self.cash_sorting, name='history', wf_id='cash_sorting_workflow')
     # check len of len workflow history is 6
     self.assertEqual(len(workflow_history), 7)
-    
+
 
   def stepCheckSourceDebit(self, sequence=None, sequence_list=None, **kwd):
     """

product/ERP5Banking/tests/testERP5BankingMoneyDepositTransfer.py

@@ -143,7 +143,7 @@ class TestERP5BankingMoneyDepositTransfer(TestERP5BankingMixin, ERP5TypeTestCase
 
     line_list = [inventory_dict_line_1, inventory_dict_line_2]
     self.usual_cash = self.paris.surface.gros_versement.guichet_1.encaisse_des_billets_et_monnaies
-    self.tri = self.paris.surface.salle_de_tri.encaisse_des_billets_et_monnaies
+    self.tri = self.paris.surface.salle_tri.encaisse_des_billets_et_monnaies
     self.createCashInventory(source=None, destination=self.usual_cash, currency=self.currency_1,
                              line_list=line_list)
 
@@ -215,7 +215,7 @@ class TestERP5BankingMoneyDepositTransfer(TestERP5BankingMixin, ERP5TypeTestCase
     # check that its source is usual_cash
     self.assertEqual(self.money_deposit_transfer.getSource(), 'site/testsite/paris/surface/gros_versement/guichet_1/encaisse_des_billets_et_monnaies')
     # check that its destination is tri
-    self.assertEqual(self.money_deposit_transfer.getDestination(), 'site/testsite/paris/surface/salle_de_tri/encaisse_des_billets_et_monnaies')
+    self.assertEqual(self.money_deposit_transfer.getDestination(), 'site/testsite/paris/surface/salle_tri/encaisse_des_billets_et_monnaies')
 
 
   def stepCreateValidLine1(self, sequence=None, sequence_list=None, **kwd):