Commit 3bb90a71 authored by Vincent Pelletier's avatar Vincent Pelletier

Replace cash_status/cancelled by cash_status/retired, as it's what happens in reality.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28409 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1836b4e7
...@@ -122,13 +122,13 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) ...@@ -122,13 +122,13 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase)
inventory_dict_line_1 = {'id' : 'inventory_line_1', inventory_dict_line_1 = {'id' : 'inventory_line_1',
'resource': self.billet_10000, 'resource': self.billet_10000,
'variation_id': ('emission_letter', 'cash_status', 'variation'), 'variation_id': ('emission_letter', 'cash_status', 'variation'),
'variation_value': ('emission_letter/p', 'cash_status/cancelled') + self.variation_list, 'variation_value': ('emission_letter/p', 'cash_status/retired') + self.variation_list,
'quantity': self.quantity_10000} 'quantity': self.quantity_10000}
inventory_dict_line_2 = {'id' : 'inventory_line_2', inventory_dict_line_2 = {'id' : 'inventory_line_2',
'resource': self.billet_5000, 'resource': self.billet_5000,
'variation_id': ('emission_letter', 'cash_status', 'variation'), 'variation_id': ('emission_letter', 'cash_status', 'variation'),
'variation_value': ('emission_letter/p', 'cash_status/cancelled') + self.variation_list, 'variation_value': ('emission_letter/p', 'cash_status/retired') + self.variation_list,
'quantity': self.quantity_5000} 'quantity': self.quantity_5000}
inventory_dict_line_for_externe_1 = {'id' : 'inventory_line_1', inventory_dict_line_for_externe_1 = {'id' : 'inventory_line_1',
...@@ -335,7 +335,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) ...@@ -335,7 +335,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase)
""" """
# create the monetary destruction line # create the monetary destruction line
self.addCashLineToDelivery(self.monetary_destruction, 'valid_line_1', 'Monetary Destruction Line', self.billet_10000, self.addCashLineToDelivery(self.monetary_destruction, 'valid_line_1', 'Monetary Destruction Line', self.billet_10000,
('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/cancelled') + self.variation_list, ('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/retired') + self.variation_list,
self.quantity_10000) self.quantity_10000)
# execute tic # execute tic
self.stepTic() self.stepTic()
...@@ -356,7 +356,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) ...@@ -356,7 +356,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase)
# now check for each variation (years 1992 and 2003) # now check for each variation (years 1992 and 2003)
for variation in self.variation_list: for variation in self.variation_list:
# get the delivery cell # get the delivery cell
cell = self.valid_line_1.getCell('emission_letter/p', variation, 'cash_status/cancelled') cell = self.valid_line_1.getCell('emission_letter/p', variation, 'cash_status/retired')
# chek portal types # chek portal types
self.assertEqual(cell.getPortalType(), 'Monetary Destruction Cell') self.assertEqual(cell.getPortalType(), 'Monetary Destruction Cell')
# check the banknote of the cell is banknote of 10000 # check the banknote of the cell is banknote of 10000
...@@ -478,7 +478,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) ...@@ -478,7 +478,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase)
""" """
# create the line # create the line
self.addCashLineToDelivery(self.monetary_destruction, 'valid_line_2', 'Monetary Destruction Line', self.billet_5000, self.addCashLineToDelivery(self.monetary_destruction, 'valid_line_2', 'Monetary Destruction Line', self.billet_5000,
('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/cancelled') + self.variation_list, ('emission_letter', 'cash_status', 'variation'), ('emission_letter/p', 'cash_status/retired') + self.variation_list,
self.quantity_5000) self.quantity_5000)
# execute tic # execute tic
self.stepTic() self.stepTic()
...@@ -498,7 +498,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) ...@@ -498,7 +498,7 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase)
self.assertEqual(len(self.valid_line_2.objectValues()), 2) self.assertEqual(len(self.valid_line_2.objectValues()), 2)
for variation in self.variation_list: for variation in self.variation_list:
# get the delivery cell # get the delivery cell
cell = self.valid_line_2.getCell('emission_letter/p', variation, 'cash_status/cancelled') cell = self.valid_line_2.getCell('emission_letter/p', variation, 'cash_status/retired')
# check the portal type # check the portal type
self.assertEqual(cell.getPortalType(), 'Monetary Destruction Cell') self.assertEqual(cell.getPortalType(), 'Monetary Destruction Cell')
if cell.getId() == 'movement_0_0_0': if cell.getId() == 'movement_0_0_0':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment