Commit 8a25d6fd authored by Jérome Perrin's avatar Jérome Perrin

Test explicitly the amount on each line instead of simply comparing to the quantity.

Test for source were wrong, in the case of source, quantity is not the same sign as for destination.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28301 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b66d9365
...@@ -116,7 +116,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -116,7 +116,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -168,7 +168,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -168,7 +168,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -234,7 +234,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -234,7 +234,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -267,8 +267,14 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -267,8 +267,14 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
line_list = invoice.contentValues( line_list = invoice.contentValues(
portal_type=portal.getPortalAccountingMovementTypeList()) portal_type=portal.getPortalAccountingMovementTypeList())
for line in line_list: for line in line_list:
self.assertEquals(line.getSourceTotalAssetPrice(), if line.getSourceValue() == self.account_module.goods_purchase:
round(655.957*line.getQuantity())) self.assertEquals(line.getSourceTotalAssetDebit(),
327978)
elif line.getSourceValue() == self.account_module.receivable:
self.assertEquals(line.getSourceTotalAssetCredit(),
327978)
else:
self.fail('line not found')
def test_NoCurrencyExchangeLineForResourceCurrency(self): def test_NoCurrencyExchangeLineForResourceCurrency(self):
""" """
...@@ -284,7 +290,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -284,7 +290,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -323,7 +329,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -323,7 +329,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -372,8 +378,15 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -372,8 +378,15 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
line_list = transaction2.contentValues( line_list = transaction2.contentValues(
portal_type=portal.getPortalAccountingMovementTypeList()) portal_type=portal.getPortalAccountingMovementTypeList())
for line in line_list: for line in line_list:
self.assertEquals(line.getDestinationTotalAssetPrice(), if line.getDestinationValue() == self.account_module.goods_purchase:
round(655.957*line.getQuantity())) self.assertEquals(line.getDestinationTotalAssetDebit(),
327978)
elif line.getDestinationValue() == self.account_module.receivable:
self.assertEquals(line.getDestinationTotalAssetCredit(),
327978)
else:
self.fail('line not found')
def test_CreateCELWithNoReferenceCurrency(self): def test_CreateCELWithNoReferenceCurrency(self):
""" """
...@@ -389,7 +402,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -389,7 +402,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -441,7 +454,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -441,7 +454,7 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
new_currency.setTitle('Francs CFA') new_currency.setTitle('Francs CFA')
new_currency.setBaseUnitQuantity(1.00) new_currency.setBaseUnitQuantity(1.00)
transaction.commit() transaction.commit()
self.tic()#execute transaction self.tic()
self.organisation1.edit( self.organisation1.edit(
price_currency=new_currency.getRelativeUrl()) price_currency=new_currency.getRelativeUrl())
euro = self.portal.currency_module.euro euro = self.portal.currency_module.euro
...@@ -488,10 +501,16 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase): ...@@ -488,10 +501,16 @@ class TestCurrencyExchangeLine(AccountingTestCase, ERP5TypeTestCase):
form_id='view') form_id='view')
line_list = invoice.contentValues( line_list = invoice.contentValues(
portal_type=portal.getPortalAccountingMovementTypeList()) portal_type=portal.getPortalAccountingMovementTypeList())
for line in line_list:
self.assertEquals(line.getDestinationTotalAssetPrice(),
round(655.957*line.getQuantity()))
for line in line_list:
if line.getDestinationValue() == self.account_module.goods_purchase:
self.assertEquals(line.getDestinationTotalAssetDebit(),
327978)
elif line.getDestinationValue() == self.account_module.receivable:
self.assertEquals(line.getDestinationTotalAssetCredit(),
327978)
else:
self.fail('line not found')
def test_suite(): def test_suite():
......
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