diff --git a/product/ERP5Banking/tests/TestERP5BankingMixin.py b/product/ERP5Banking/tests/TestERP5BankingMixin.py index 3ef8f3b27e4f3c68d5b1f4553484bc30df3193a9..0fb1bed3019b7441208b15a93428eb31c080887b 100644 --- a/product/ERP5Banking/tests/TestERP5BankingMixin.py +++ b/product/ERP5Banking/tests/TestERP5BankingMixin.py @@ -292,10 +292,11 @@ class TestERP5BankingMixin: start_date='01/01/1900',stop_date='01/01/2900', price_currency='currency_module/EUR', currency_exchange_type_list=['currency_exchange_type/sale', - 'currency_exchange_type/purchase'], + 'currency_exchange_type/purchase', + 'currency_exchange_type/transfer'], base_price=2) cell_list = exchange_line.objectValues() - self.assertEquals(len(cell_list),2) + self.assertEquals(len(cell_list),3) for cell in cell_list: cell.setBasePrice(650.0) cell.setDiscount(650.0) @@ -438,6 +439,7 @@ class TestERP5BankingMixin: self.currency_exchange_type = getattr(self.category_tool,'currency_exchange_type') self.currency_exchange_type.newContent(id='sale') self.currency_exchange_type.newContent(id='purchase') + self.currency_exchange_type.newContent(id='transfer') # get the base category function self.function_base_category = getattr(self.category_tool, 'function') @@ -684,6 +686,7 @@ class TestERP5BankingMixin: """ return self.checkbook_model_module.newContent(id = id, portal_type = 'Check Model', + title = 'Check', ) def createCheck(self, id, reference, checkbook,bank_account=None): @@ -700,6 +703,21 @@ class TestERP5BankingMixin: check.confirm() return check + def createTravelerCheckModel(self, id): + """ + Create a checkbook for the given bank account + """ + model = self.checkbook_model_module.newContent(id = id, + title = 'USD Traveler Check', + portal_type = 'Check Model', + fixed_price = 1 + ) + variation = model.newContent(id='variant_1', + portal_type='Check Model Type Variation', + price=50) + model.setPriceCurrency(self.currency_2) + return model + def createCashContainer(self, document, container_portal_type, global_dict, line_list, delivery_line_type='Cash Delivery Line'): """ Create a cash container diff --git a/product/ERP5Banking/tests/testERP5BankingAccountIncident.py b/product/ERP5Banking/tests/testERP5BankingAccountIncident.py index 824734747a018db96502360a9e151f289b1be252..6d36dc02b09777382f147944efe46b70a99dcd38 100755 --- a/product/ERP5Banking/tests/testERP5BankingAccountIncident.py +++ b/product/ERP5Banking/tests/testERP5BankingAccountIncident.py @@ -251,7 +251,7 @@ class TestERP5BankingAccountIncident(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -309,7 +309,7 @@ class TestERP5BankingAccountIncident(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py b/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py index 63e616ab0e5c314084dbf4edd08bc7301e405497..924add9d58b969aebad925b9c5df3dfa8081c523 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py +++ b/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py @@ -334,7 +334,7 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -375,7 +375,7 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 200.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -435,7 +435,7 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 5000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -469,7 +469,7 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 100.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashClassification.py b/product/ERP5Banking/tests/testERP5BankingCashClassification.py index 463a04d3305d6776668a774c9ceb9481310436c4..9024c4f57c2597a30ffbb1d0e80ae3ed18b6e9fd 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashClassification.py +++ b/product/ERP5Banking/tests/testERP5BankingCashClassification.py @@ -261,7 +261,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -301,7 +301,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 200.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -341,7 +341,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 5000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -399,7 +399,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 10000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -438,7 +438,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -477,7 +477,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 5000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashExchange.py b/product/ERP5Banking/tests/testERP5BankingCashExchange.py index 93cd1be71ce0cde6c7505a19bf6cfe5d33af38dd..ee841d3ff03a3ac2970b3ec25e63456da0514bae 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashExchange.py +++ b/product/ERP5Banking/tests/testERP5BankingCashExchange.py @@ -269,7 +269,7 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -309,7 +309,7 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 200.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -368,7 +368,7 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 5000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -406,7 +406,7 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 100.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashIncident.py b/product/ERP5Banking/tests/testERP5BankingCashIncident.py index 6bf6899f0de56ef88e9920306d172204dae11b54..3c6165d183a4722b5e7fc72769987f4607d4dae0 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashIncident.py +++ b/product/ERP5Banking/tests/testERP5BankingCashIncident.py @@ -220,7 +220,7 @@ class TestERP5BankingCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -278,7 +278,7 @@ class TestERP5BankingCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashInventory.py b/product/ERP5Banking/tests/testERP5BankingCashInventory.py index 0bc8b0b847ab47e886e99a2e035a2581ec28d1c2..98d0a7f43576f65ac5ebb1b246aa191b2d499fab 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashInventory.py +++ b/product/ERP5Banking/tests/testERP5BankingCashInventory.py @@ -242,7 +242,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -299,7 +299,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: @@ -358,7 +358,7 @@ class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_3.getPrice(), 5000.0) # check the unit of coin - self.assertEqual(self.valid_line_3.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_3.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_3.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashSorting.py b/product/ERP5Banking/tests/testERP5BankingCashSorting.py index 494522b6f2faacecc99edf4a054a2d2e0c776d06..4af92ae9b1a71ab6865cd67034206e2cfe39737e 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashSorting.py +++ b/product/ERP5Banking/tests/testERP5BankingCashSorting.py @@ -261,7 +261,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -301,7 +301,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 200.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -341,7 +341,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 5000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -399,7 +399,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 10000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -438,7 +438,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -477,7 +477,7 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 5000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCashSortingIncident.py b/product/ERP5Banking/tests/testERP5BankingCashSortingIncident.py index b333895453df9a3405620d203fb714f1a537af3a..0687c35728113c0a846cf17aa5ca01f6066abfc2 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashSortingIncident.py +++ b/product/ERP5Banking/tests/testERP5BankingCashSortingIncident.py @@ -231,7 +231,7 @@ class TestERP5BankingCashSortingIncident(TestERP5BankingMixin, ERP5TypeTestCase) # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -289,7 +289,7 @@ class TestERP5BankingCashSortingIncident(TestERP5BankingMixin, ERP5TypeTestCase) # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py b/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py index b374e00097c078a5d854c6e110dfb1e6bd4d3a45..11c3fe55129adc208c1288d0a9a579477c2f012d 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py @@ -101,6 +101,7 @@ class TestERP5BankingCheckbookReception(TestERP5BankingMixin, ERP5TypeTestCase): self.createManagerAndLogin() self.createFunctionGroupSiteCategory() self.checkbook_model_1 = self.createCheckbookModel('checkbook_model_1') + self.traveler_check_model = self.createTravelerCheckModel('traveler_check_model') self.check_model_1 = self.createCheckModel('check_model_1') self.reception = self.paris.caveau.auxiliaire.encaisse_des_billets_et_monnaies self.destination_site = self.paris diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py b/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py index d3b7a232bf4f67ebf685f3af71e18ef9711db7b6..4d4e7a1a39c70a6b05b72011bea0f31742f23bfe 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py @@ -60,10 +60,7 @@ class TestERP5BankingCheckbookUsualCashTransferMixin( id='checkbook_vault_transfer', portal_type='Checkbook Vault Transfer', source_value=self.vault_transfer_source_site, destination_value=self.vault_transfer_destination_site, - resource_value=self.currency_1, start_date=(self.date-3)) - # get the checkbook vault transfer document - self.checkbook_vault_transfer = getattr(self.getCheckbookVaultTransferModule(), 'checkbook_vault_transfer') # Add a line for check and checkbook self.line_1 = self.checkbook_vault_transfer.newContent(quantity=1, resource_value=self.checkbook_model_1, @@ -86,6 +83,31 @@ class TestERP5BankingCheckbookUsualCashTransferMixin( self.workflow_tool.doActionFor(self.checkbook_vault_transfer, 'confirm_to_deliver_action', wf_id='checkbook_vault_transfer_workflow') + def createCheckbookVaultTransferWithTravelerCheck(self, sequence=None, + sequence_list=None, **kwd): + """ + Create a checkbook Reception + We do not need to check it because it is already done in another unit test. + """ + self.checkbook_vault_transfer = self.getCheckbookVaultTransferModule().newContent( + id='checkbook_vault_transfer', portal_type='Checkbook Vault Transfer', + source_value=self.vault_transfer_source_site, + destination_value=self.vault_transfer_destination_site, + start_date=(self.date-3)) + # Add a line for traveler check + self.line_2 = self.checkbook_vault_transfer.newContent(quantity=1, + resource_value=self.traveler_check_model, + check_amount_value=self.traveler_check_model.variant_1, + aggregate_value=self.traveler_check, + ) + self.workflow_tool.doActionFor(self.checkbook_vault_transfer, 'plan_action', + wf_id='checkbook_vault_transfer_workflow') + self.workflow_tool.doActionFor(self.checkbook_vault_transfer, 'order_action', + wf_id='checkbook_vault_transfer_workflow') + self.workflow_tool.doActionFor(self.checkbook_vault_transfer, 'confirm_action', + wf_id='checkbook_vault_transfer_workflow') + self.workflow_tool.doActionFor(self.checkbook_vault_transfer, 'confirm_to_deliver_action', + wf_id='checkbook_vault_transfer_workflow') class TestERP5BankingCheckbookUsualCashTransfer(TestERP5BankingCheckbookUsualCashTransferMixin, diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py b/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py index 7b15e0a5329593ac2881c6f0368bba87ca573521..6bdf51ee093909982971576bd2e3278d72d3925e 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py @@ -54,7 +54,6 @@ class TestERP5BankingCheckbookVaultTransferMixin: self.checkbook_reception = self.checkbook_reception_module.newContent( id='checkbook_reception', portal_type='Checkbook Reception', source_value=None, destination_value=self.reception_destination_site, - resource_value=self.currency_1, start_date=(self.date-4)) # get the checkbook reception document self.checkbook_reception = getattr(self.checkbook_reception_module, 'checkbook_reception') @@ -78,12 +77,44 @@ class TestERP5BankingCheckbookVaultTransferMixin: self.workflow_tool.doActionFor(self.checkbook_reception, 'deliver_action', wf_id='checkbook_reception_workflow') - def checkItemsCreated(self, sequence=None, sequence_list=None, **kwd): + def createCheckbookReceptionWithTravelerCheck(self, sequence=None, + sequence_list=None, **kwd): + """ + Create a checkbook Reception + We do not need to check it because it is already done in another unit test. + """ + self.checkbook_reception = self.checkbook_reception_module.newContent( + id='checkbook_reception', portal_type='Checkbook Reception', + source_value=None, destination_value=self.reception_destination_site, + start_date=(self.date-4)) + # get the checkbook reception document + self.checkbook_reception = getattr(self.checkbook_reception_module, 'checkbook_reception') + # Add a line for check and checkbook + self.line_2 = self.checkbook_reception.newContent(quantity=1, + resource_value=self.traveler_check_model, + check_amount_value=self.traveler_check_model.variant_1, + reference_range_min=52, + reference_range_max=52, + ) + self.workflow_tool.doActionFor(self.checkbook_reception, 'confirm_action', + wf_id='checkbook_reception_workflow') + self.workflow_tool.doActionFor(self.checkbook_reception, 'deliver_action', + wf_id='checkbook_reception_workflow') + + def checkItemsCreatedWithTravelerCheck(self, sequence=None, + sequence_list=None, **kwd): + self.checkItemsCreated(sequence=sequence, + sequence_list=sequence_list, + traveler_check=1,**kwd) + + def checkItemsCreated(self, sequence=None, sequence_list=None, + traveler_check=0,**kwd): """ Create the checkbook """ self.checkbook_1 = None self.check_1 = None + self.traveler_check = None for line in self.checkbook_reception.objectValues(): aggregate_value_list = line.getAggregateValueList() @@ -92,9 +123,15 @@ class TestERP5BankingCheckbookVaultTransferMixin: if aggregate_value.getPortalType()=='Checkbook': self.checkbook_1 = aggregate_value elif aggregate_value.getPortalType()=='Check': - self.check_1 = aggregate_value - self.assertNotEquals(None,self.checkbook_1) - self.assertNotEquals(None,self.check_1) + if aggregate_value.getResourceValue().isFixedPrice(): + self.traveler_check = aggregate_value + else: + self.check_1 = aggregate_value + if not traveler_check: + self.assertNotEquals(None,self.checkbook_1) + self.assertNotEquals(None,self.check_1) + else: + self.assertNotEquals(traveler_check,None) class TestERP5BankingCheckbookVaultTransfer(TestERP5BankingCheckbookVaultTransferMixin, TestERP5BankingMixin, ERP5TypeTestCase): diff --git a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py index f862eef26e828079ec13f9e58078b7f7041c5814..7298810580e07b03ac9cc413dcdd1d8c3a94850d 100755 --- a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py @@ -238,7 +238,7 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -278,7 +278,7 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_incoming_line.getPrice(), 200.0) # check the unit of banknote - self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_incoming_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_incoming_line.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -336,7 +336,7 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 10000.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: @@ -375,7 +375,7 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase # check the value of coin self.assertEqual(self.valid_outgoing_line.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_outgoing_line.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_outgoing_line.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py index 071f007b5226623a48d461fa140225d7444af1b8..27e7276818afcff036fc80acfdd0c1d272d2aea1 100644 --- a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py @@ -248,7 +248,7 @@ class TestERP5BankingCounterRendering(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -306,7 +306,7 @@ class TestERP5BankingCounterRendering(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py index 3cc741ec268ea1034cf114058b73de94a8d05c58..d09d05798114ccd4ae3a08ad7fe67cb4736ef236 100755 --- a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py +++ b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py @@ -189,7 +189,7 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 50.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 1) # now check for each variation (years 1992 and 2003) @@ -233,7 +233,7 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 20.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 1) # now check for each variation (years 1992 and 2003) @@ -269,7 +269,7 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 50.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have one delivery cells self.assertEqual(len(self.valid_line_1.objectValues()), 1) # now check for variation @@ -299,7 +299,7 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 20.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have one delivery cells self.assertEqual(len(self.valid_line_1.objectValues()), 1) # now check for variation diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py index f44ed74be951412de262cd42b80d30910b0b5642..40f1773cfab3b779cae898b1407abeee4fc949e6 100644 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py @@ -339,7 +339,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -385,7 +385,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -444,7 +444,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) # check the value of banknote self.assertEqual(self.valid_line_2.getPrice(), 5000.0) # check the unit of banknote - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: @@ -483,7 +483,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) # check the value of banknote self.assertEqual(self.valid_line_2.getPrice(), 5000.0) # check the unit of banknote - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py b/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py index dd7bf81529c855f7ff279c50d8263dcb77401ed0..c3780f3f5e9e98b7fbe3f2fc94c0b94f54e6f46b 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py @@ -256,7 +256,7 @@ class TestERP5BankingMonetaryRecall(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -314,7 +314,7 @@ class TestERP5BankingMonetaryRecall(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py b/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py index ed0a4abf393928ca0979939b2aa920c6a5ed7b70..6076712214279309452a874bb5c9f6a9c3277e50 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py @@ -215,7 +215,7 @@ class TestERP5BankingMonetaryReception(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have one delivery cells self.assertEqual(len(self.valid_line_1.objectValues()), 1) # now check for variation 2003 diff --git a/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py b/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py index 26b4a0b925a625cc37f12b626ff56ee050d16a18..17643547e6ee9f741b3de84027199e2ef370f0f7 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py @@ -234,7 +234,7 @@ class TestERP5BankingMonetarySurvey(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -292,7 +292,7 @@ class TestERP5BankingMonetarySurvey(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py b/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py index ae9b2fbfe350c3867eb74e1377aaaa2e325917b0..6d24e59c09115331a84f9870c57f474f011dcef9 100644 --- a/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py @@ -257,7 +257,7 @@ class TestERP5BankingMoneyDepositRendering(TestERP5BankingMixin, ERP5TypeTestCas # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -315,7 +315,7 @@ class TestERP5BankingMoneyDepositRendering(TestERP5BankingMixin, ERP5TypeTestCas # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingMoneyDepositTransfer.py b/product/ERP5Banking/tests/testERP5BankingMoneyDepositTransfer.py index f9ba6afea4bfa898b0a6eb5cdd739a68c70042ba..ed82e2ae9ae401ece74e9522f7d6834784e59fed 100644 --- a/product/ERP5Banking/tests/testERP5BankingMoneyDepositTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingMoneyDepositTransfer.py @@ -243,7 +243,7 @@ class TestERP5BankingMoneyDepositTransfer(TestERP5BankingMixin, ERP5TypeTestCase # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -301,7 +301,7 @@ class TestERP5BankingMoneyDepositTransfer(TestERP5BankingMixin, ERP5TypeTestCase # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py b/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py index 4794444eadc2f9844373817c18229d48c05ccc0c..bcfdfbde9f92678968859e38e7136a095162d64f 100755 --- a/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py +++ b/product/ERP5Banking/tests/testERP5BankingUsualCashIncident.py @@ -213,7 +213,7 @@ class TestERP5BankingUsualCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -271,7 +271,7 @@ class TestERP5BankingUsualCashIncident(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py b/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py index 879fe924f80107fdcfac1047866f15f751778d38..7ed80b551ebfc27d18691e4debcfbc997c8d9459 100644 --- a/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py @@ -265,7 +265,7 @@ class TestERP5BankingUsualCashRendering(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -327,7 +327,7 @@ class TestERP5BankingUsualCashRendering(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py b/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py index c3ceb54a025ad9a0a9ea2bcfaad420389adf1a66..8da94f06046551b4e0fbabf930603a93c4650c4a 100755 --- a/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py @@ -246,7 +246,7 @@ class TestERP5BankingUsualCashTransfer(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -304,7 +304,7 @@ class TestERP5BankingUsualCashTransfer(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: diff --git a/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py b/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py index 7378c53bee4b21c02fbe11d2c9afa925900fd760..43c6ae86202dd599c0a894f02794db9b7562ba76 100644 --- a/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py @@ -315,7 +315,7 @@ class TestERP5BankingVaultTransfer(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -363,7 +363,7 @@ class TestERP5BankingVaultTransfer(TestERP5BankingMixin, ERP5TypeTestCase): # chek the value of the banknote self.assertEqual(self.valid_line_1.getPrice(), 10000.0) # check the unit of banknote - self.assertEqual(self.valid_line_1.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_1.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_1.objectValues()), 2) # now check for each variation (years 1992 and 2003) @@ -420,7 +420,7 @@ class TestERP5BankingVaultTransfer(TestERP5BankingMixin, ERP5TypeTestCase): # check the value of coin self.assertEqual(self.valid_line_2.getPrice(), 200.0) # check the unit of coin - self.assertEqual(self.valid_line_2.getQuantityUnit(), 'quantity_unit/unit') + self.assertEqual(self.valid_line_2.getQuantityUnit(), 'unit') # check we have two delivery cells: (one for year 1992 and one for 2003) self.assertEqual(len(self.valid_line_2.objectValues()), 2) for variation in self.variation_list: