Commit 5923945f authored by Jérome Perrin's avatar Jérome Perrin

always pass profit_and_loss_account= parameter to

AccountingPeriod_createBalanceTransaction , it is now required.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16560 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2f8cbecd
...@@ -250,7 +250,8 @@ class TestClosingPeriod(AccountingTestCase): ...@@ -250,7 +250,8 @@ class TestClosingPeriod(AccountingTestCase):
dict(source_value=self.account_module.goods_purchase, dict(source_value=self.account_module.goods_purchase,
source_credit=100))) source_credit=100)))
period.AccountingPeriod_createBalanceTransaction() period.AccountingPeriod_createBalanceTransaction(
profit_and_loss_account=None)
accounting_transaction_list = self.accounting_module.contentValues() accounting_transaction_list = self.accounting_module.contentValues()
self.assertEquals(3, len(accounting_transaction_list)) self.assertEquals(3, len(accounting_transaction_list))
balance_transaction_list = self.accounting_module.contentValues( balance_transaction_list = self.accounting_module.contentValues(
...@@ -338,7 +339,8 @@ class TestClosingPeriod(AccountingTestCase): ...@@ -338,7 +339,8 @@ class TestClosingPeriod(AccountingTestCase):
dict(source_value=self.account_module.receivable, dict(source_value=self.account_module.receivable,
source_credit=200))) source_credit=200)))
period.AccountingPeriod_createBalanceTransaction() period.AccountingPeriod_createBalanceTransaction(
profit_and_loss_account=None)
accounting_transaction_list = self.accounting_module.contentValues() accounting_transaction_list = self.accounting_module.contentValues()
self.assertEquals(3, len(accounting_transaction_list)) self.assertEquals(3, len(accounting_transaction_list))
balance_transaction_list = self.accounting_module.contentValues( balance_transaction_list = self.accounting_module.contentValues(
...@@ -445,7 +447,8 @@ class TestClosingPeriod(AccountingTestCase): ...@@ -445,7 +447,8 @@ class TestClosingPeriod(AccountingTestCase):
dict(destination_value=self.account_module.goods_purchase, dict(destination_value=self.account_module.goods_purchase,
destination_credit=200))) destination_credit=200)))
period.AccountingPeriod_createBalanceTransaction() period.AccountingPeriod_createBalanceTransaction(
profit_and_loss_account=None)
accounting_transaction_list = self.accounting_module.contentValues() accounting_transaction_list = self.accounting_module.contentValues()
self.assertEquals(3, len(accounting_transaction_list)) self.assertEquals(3, len(accounting_transaction_list))
balance_transaction_list = self.accounting_module.contentValues( balance_transaction_list = self.accounting_module.contentValues(
...@@ -566,7 +569,8 @@ class TestClosingPeriod(AccountingTestCase): ...@@ -566,7 +569,8 @@ class TestClosingPeriod(AccountingTestCase):
source_asset_credit=2.2, source_asset_credit=2.2,
source_credit=200))) source_credit=200)))
period.AccountingPeriod_createBalanceTransaction() period.AccountingPeriod_createBalanceTransaction(
profit_and_loss_account=None)
accounting_transaction_list = self.accounting_module.contentValues() accounting_transaction_list = self.accounting_module.contentValues()
self.assertEquals(3, len(accounting_transaction_list)) self.assertEquals(3, len(accounting_transaction_list))
balance_transaction_list = self.accounting_module.contentValues( balance_transaction_list = self.accounting_module.contentValues(
...@@ -1329,9 +1333,11 @@ class TestAccounting(ERP5TypeTestCase): ...@@ -1329,9 +1333,11 @@ class TestAccounting(ERP5TypeTestCase):
def stepDeliverAccountingPeriod(self, sequence, **kw): def stepDeliverAccountingPeriod(self, sequence, **kw):
"""Deliver the Accounting Period.""" """Deliver the Accounting Period."""
accounting_period = sequence.get('accounting_period') accounting_period = sequence.get('accounting_period')
# take any account for profit and loss account, here we don't care
profit_and_loss_account = self.portal.account_module.contentValues()[0]
self.getPortal().portal_workflow.doActionFor( self.getPortal().portal_workflow.doActionFor(
accounting_period, accounting_period, 'deliver_action',
'deliver_action' ) profit_and_loss_account=profit_and_loss_account.getRelativeUrl())
self.assertEquals(accounting_period.getSimulationState(), self.assertEquals(accounting_period.getSimulationState(),
'delivered') 'delivered')
...@@ -2223,8 +2229,8 @@ class TestAccounting(ERP5TypeTestCase): ...@@ -2223,8 +2229,8 @@ class TestAccounting(ERP5TypeTestCase):
def test_AccountingPeriodRefusesWrongDateTransactionValidation( def test_AccountingPeriodRefusesWrongDateTransactionValidation(
self, quiet=QUIET, run=RUN_ALL_TESTS): self, quiet=QUIET, run=RUN_ALL_TESTS):
"""Accounting Periods prevents transactions to be validated """Accounting Periods prevents transactions from being validated when there
when there is no oppened accounting period""" is no oppened accounting period"""
if not run : return if not run : return
self.playSequence(""" self.playSequence("""
stepCreateCurrencies stepCreateCurrencies
......
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