Commit 4085ba8a authored by Vincent Pelletier's avatar Vincent Pelletier

Do not use deliveryLineType with fast=0. Use portal_type instead.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18496 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d7045d72
......@@ -401,9 +401,9 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas
# Check number of lines
self.assertEqual(len(self.cash_balance_regulation.objectValues()), 2)
# Check quantity of banknotes (2 for 1992 and 3 for 2003)
self.assertEqual(self.cash_balance_regulation.getTotalQuantity(fast=0, deliveryLineType="Incoming Cash Balance Regulation Line"), 17.0)
self.assertEqual(self.cash_balance_regulation.getTotalQuantity(fast=0, portal_type="Incoming Cash Balance Regulation Line"), 17.0)
# Check the total price
self.assertEqual(self.cash_balance_regulation.getTotalPrice(fast=0, deliveryLineType="Incoming Cash Balance Regulation Line"), 10000 * 5.0 + 200 * 12.0)
self.assertEqual(self.cash_balance_regulation.getTotalPrice(fast=0, portal_type="Incoming Cash Balance Regulation Line"), 10000 * 5.0 + 200 * 12.0)
def stepCreateValidOutgoingLine(self, sequence=None, sequence_list=None, **kwd):
......@@ -489,9 +489,9 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas
# Check number of lines (line1 + line2)
self.assertEqual(len(self.cash_balance_regulation.objectValues()), 4)
# Check quantity, banknotes : 2 for 1992 and 3 for 2003, coin : 5 for 1992 and 7 for 2003
self.assertEqual(self.cash_balance_regulation.getTotalQuantity(fast=0, deliveryLineType="Outgoing Cash Balance Regulation Line"), 34.0)
self.assertEqual(self.cash_balance_regulation.getTotalQuantity(fast=0, portal_type="Outgoing Cash Balance Regulation Line"), 34.0)
# check the total price
self.assertEqual(self.cash_balance_regulation.getTotalPrice(fast=0, deliveryLineType="Outgoing Cash Balance Regulation Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 24.0)
self.assertEqual(self.cash_balance_regulation.getTotalPrice(fast=0, portal_type="Outgoing Cash Balance Regulation Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 24.0)
......
......@@ -425,9 +425,9 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase):
# Check number of lines
self.assertEqual(len(self.cash_sorting.objectValues()), 4)
# Check quantity of banknotes (2 for 1992 and 3 for 2003)
self.assertEqual(self.cash_sorting.getTotalQuantity(fast=0, deliveryLineType="Incoming Cash Sorting Line"), 51.0)
self.assertEqual(self.cash_sorting.getTotalQuantity(fast=0, portal_type="Incoming Cash Sorting Line"), 51.0)
# Check the total price
self.assertEqual(self.cash_sorting.getTotalPrice(fast=0, deliveryLineType="Incoming Cash Sorting Line"), 10000 * 5.0 + 100 * 10.0 + 200 * 12.0 + 5000 * 24.0)
self.assertEqual(self.cash_sorting.getTotalPrice(fast=0, portal_type="Incoming Cash Sorting Line"), 10000 * 5.0 + 100 * 10.0 + 200 * 12.0 + 5000 * 24.0)
def stepCreateValidOutgoingLineForInternalBanknote(self, sequence=None, sequence_list=None, **kwd):
......
......@@ -332,9 +332,9 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase):
# Check number of lines
self.assertEqual(len(self.cash_exchange.objectValues()), 2)
# Check quantity of banknotes (2 for 1992 and 3 for 2003)
self.assertEqual(self.cash_exchange.getTotalQuantity(fast=0, deliveryLineType="Incoming Cash Exchange Line"), 17.0)
self.assertEqual(self.cash_exchange.getTotalQuantity(fast=0, portal_type="Incoming Cash Exchange Line"), 17.0)
# Check the total price
self.assertEqual(self.cash_exchange.getTotalPrice(fast=0, deliveryLineType="Incoming Cash Exchange Line"), 10000 * 3.0 + 10000 * 2.0 + 200 * 5.0 + 200 * 7.0)
self.assertEqual(self.cash_exchange.getTotalPrice(fast=0, portal_type="Incoming Cash Exchange Line"), 10000 * 3.0 + 10000 * 2.0 + 200 * 5.0 + 200 * 7.0)
def stepCreateValidOutgoingLine(self, sequence=None, sequence_list=None, **kwd):
......@@ -427,9 +427,9 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase):
# Check number of lines (line1 + line2)
self.assertEqual(len(self.cash_exchange.objectValues()), 4)
# Check quantity, banknotes : 2 for 1992 and 3 for 2003, coin : 5 for 1992 and 7 for 2003
self.assertEqual(self.cash_exchange.getTotalQuantity(fast=0, deliveryLineType="Outgoing Cash Exchange Line"), 34.0)
self.assertEqual(self.cash_exchange.getTotalQuantity(fast=0, portal_type="Outgoing Cash Exchange Line"), 34.0)
# check the total price
self.assertEqual(self.cash_exchange.getTotalPrice(fast=0, deliveryLineType="Outgoing Cash Exchange Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 24.0)
self.assertEqual(self.cash_exchange.getTotalPrice(fast=0, portal_type="Outgoing Cash Exchange Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 24.0)
......
......@@ -328,9 +328,9 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase):
# Check number of lines
self.assertEqual(len(self.cash_sorting.objectValues()), 3)
# Check quantity of banknotes (2 for 1992 and 3 for 2003)
self.assertEqual(self.cash_sorting.getTotalQuantity(fast=0, deliveryLineType="Incoming Cash Sorting Line"), 41.0)
self.assertEqual(self.cash_sorting.getTotalQuantity(fast=0, portal_type="Incoming Cash Sorting Line"), 41.0)
# Check the total price
self.assertEqual(self.cash_sorting.getTotalPrice(fast=0, deliveryLineType="Incoming Cash Sorting Line"), 10000 * 5.0 + 200 * 12.0 + 5000 * 24.0)
self.assertEqual(self.cash_sorting.getTotalPrice(fast=0, portal_type="Incoming Cash Sorting Line"), 10000 * 5.0 + 200 * 12.0 + 5000 * 24.0)
def stepCreateValidOutgoingLineForInternalBanknote(self, sequence=None, sequence_list=None, **kwd):
......
......@@ -297,9 +297,9 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCa
# Check number of lines
self.assertEqual(len(self.cash_to_currency_purchase.objectValues()), 1)
# Check quantity of banknotes (2 for 1992 and 3 for 2003)
self.assertEqual(self.cash_to_currency_purchase.getTotalQuantity(fast=0, deliveryLineType="Incoming Cash To Currency Purchase Line"), 5.0)
self.assertEqual(self.cash_to_currency_purchase.getTotalQuantity(fast=0, portal_type="Incoming Cash To Currency Purchase Line"), 5.0)
# Check the total price
self.assertEqual(self.cash_to_currency_purchase.getTotalPrice(fast=0, deliveryLineType="Incoming Cash To Currency Purchase Line"), 20 * 5.0)
self.assertEqual(self.cash_to_currency_purchase.getTotalPrice(fast=0, portal_type="Incoming Cash To Currency Purchase Line"), 20 * 5.0)
def stepCreateValidOutgoingLine(self, sequence=None, sequence_list=None, **kwd):
......@@ -392,9 +392,9 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCa
# Check number of lines (line1 + line2)
self.assertEqual(len(self.cash_to_currency_purchase.objectValues()), 3)
# Check quantity, banknotes : 2 for 1992 and 3 for 2003, coin : 5 for 1992 and 7 for 2003
self.assertEqual(self.cash_to_currency_purchase.getTotalQuantity(fast=0, deliveryLineType="Outgoing Cash To Currency Purchase Line"), 130.0)
self.assertEqual(self.cash_to_currency_purchase.getTotalQuantity(fast=0, portal_type="Outgoing Cash To Currency Purchase Line"), 130.0)
# check the total price
self.assertEqual(self.cash_to_currency_purchase.getTotalPrice(fast=0, deliveryLineType="Outgoing Cash To Currency Purchase Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 120.0)
self.assertEqual(self.cash_to_currency_purchase.getTotalPrice(fast=0, portal_type="Outgoing Cash To Currency Purchase Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 120.0)
......
......@@ -292,9 +292,9 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase):
"""
# Check number of lines
self.assertEqual(len(self.cash_to_currency_sale.objectValues()), 2)
self.assertEqual(self.cash_to_currency_sale.getTotalQuantity(fast=0, deliveryLineType="Incoming Cash To Currency Sale Line"), 210)
self.assertEqual(self.cash_to_currency_sale.getTotalQuantity(fast=0, portal_type="Incoming Cash To Currency Sale Line"), 210)
# Check the total price
self.assertEqual(self.cash_to_currency_sale.getTotalPrice(fast=0, deliveryLineType="Incoming Cash To Currency Sale Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 200.0)
self.assertEqual(self.cash_to_currency_sale.getTotalPrice(fast=0, portal_type="Incoming Cash To Currency Sale Line"), 5000 * 4.0 + 100 * 0.0 + 5000 * 6.0 + 100 * 200.0)
def stepCreateValidOutgoingLine(self, sequence=None, sequence_list=None, **kwd):
......@@ -343,9 +343,9 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase):
# Check number of lines (line1 + line2)
self.assertEqual(len(self.cash_to_currency_sale.objectValues()), 3)
# Check quantity, banknotes : 2 for 1992 and 3 for 2003, coin : 5 for 1992 and 7 for 2003
self.assertEqual(self.cash_to_currency_sale.getTotalQuantity(fast=0, deliveryLineType="Outgoing Cash To Currency Sale Line"), 5.0)
self.assertEqual(self.cash_to_currency_sale.getTotalQuantity(fast=0, portal_type="Outgoing Cash To Currency Sale Line"), 5.0)
# check the total price
self.assertEqual(self.cash_to_currency_sale.getTotalPrice(fast=0, deliveryLineType="Outgoing Cash To Currency Sale Line"), 20 * 5.0)
self.assertEqual(self.cash_to_currency_sale.getTotalPrice(fast=0, portal_type="Outgoing Cash To Currency Sale Line"), 20 * 5.0)
def stepDeliverCashToCurrencySale(self, sequence=None, sequence_list=None, **kwd):
"""
......
......@@ -301,9 +301,9 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase
# Check number of lines
self.assertEqual(len(self.classification_survey.objectValues()), 2)
# Check quantity of banknotes (2 for 1992 and 3 for 2003)
self.assertEqual(self.classification_survey.getTotalQuantity(fast=0, deliveryLineType="Incoming Classification Survey Line"), 17.0)
self.assertEqual(self.classification_survey.getTotalQuantity(fast=0, portal_type="Incoming Classification Survey Line"), 17.0)
# Check the total price
self.assertEqual(self.classification_survey.getTotalPrice(fast=0, deliveryLineType="Incoming Classification Survey Line"), 10000 * 5.0 + 200 * 12.0)
self.assertEqual(self.classification_survey.getTotalPrice(fast=0, portal_type="Incoming Classification Survey Line"), 10000 * 5.0 + 200 * 12.0)
def stepCreateValidOutgoingLineForInternalBanknote(self, sequence=None, sequence_list=None, **kwd):
......
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