From 9f65f85df10324bc11b66cc077303c8aaa17e632 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Wed, 7 Jan 2015 12:32:46 +0100 Subject: [PATCH] [FIX] account_journal_period_close: fix test suite for 2015 year change --- .../test_account_journal_period_close.py | 71 +++++++++++-------- 1 file changed, 43 insertions(+), 28 deletions(-) diff --git a/account_journal_period_close/tests/test_account_journal_period_close.py b/account_journal_period_close/tests/test_account_journal_period_close.py index 3d2c4caed..9134e8aa8 100644 --- a/account_journal_period_close/tests/test_account_journal_period_close.py +++ b/account_journal_period_close/tests/test_account_journal_period_close.py @@ -99,43 +99,64 @@ def journal_period_draft(self, journal_period_id, context): context=context) +def get_journal_copy_id(self, journal_id, context=None): + return self.registry('account.journal').copy(self.cr, self.uid, + journal_id, {}, context) + + +def create_fiscalyear(self, year, company_id): + fiscalyear_obj = self.registry('account.fiscalyear') + fiscalyear_id = fiscalyear_obj.create(self.cr, self.uid, { + 'name': year, + 'code': year, + 'date_start': year + '-01-01', + 'date_stop': year + '-12-31', + 'company_id': company_id + }) + fiscalyear_obj.create_period(self.cr, self.uid, [fiscalyear_id]) + return fiscalyear_id + + class TestAccountJournalPeriodClose(common.TransactionCase): def setUp(self): super(TestAccountJournalPeriodClose, self).setUp() + company_id = self.ref('base.main_company') + fiscalyear_id = create_fiscalyear(self, '2013', company_id) + journal_id = self.ref('account.sales_journal') + self.period_id = self.registry('account.period')\ + .search(self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear_id)], + limit=1)[0] + self.journal_id = get_journal_copy_id(self, journal_id) def test_close_period_open_journal(self): context = {} - journal_id = self.ref('account.sales_journal') - period_id = self.ref('account.period_1') - close_period(self, period_id, context) + close_period(self, self.period_id, context) journal_period_id = create_journal_period(self, - period_id, - journal_id, + self.period_id, + self.journal_id, context) journal_period_draft(self, journal_period_id, context) self.registry('account.move')\ .create(self.cr, self.uid, get_simple_account_move_values(self, - period_id, - journal_id), + self.period_id, + self.journal_id), context=context) # Here, no exception should be raised because the journal's state is # draft although the period is closed def test_open_period_close_journal(self): context = {} - journal_id = self.ref('account.sales_journal') - period_id = self.ref('account.period_1') journal_period_id = create_journal_period(self, - period_id, - journal_id, + self.period_id, + self.journal_id, context) journal_period_done(self, journal_period_id, context) move_values = get_simple_account_move_values(self, - period_id, - journal_id) + self.period_id, + self.journal_id) # I check if the exception is correctly raised at create of an account # move which is linked with a closed journal self.assertRaises(osv.except_osv, @@ -144,16 +165,14 @@ class TestAccountJournalPeriodClose(common.TransactionCase): def test_change_journal_on_move(self): context = {} - journal_id = self.ref('account.sales_journal') journal_cash_id = self.ref('account.cash_journal') - period_id = self.ref('account.period_1') journal_period_id = create_journal_period(self, - period_id, - journal_id, + self.period_id, + self.journal_id, context) journal_period_done(self, journal_period_id, context) move_values = get_simple_account_move_values(self, - period_id, + self.period_id, journal_cash_id) self.registry('account.move').create(self.cr, self.uid, @@ -173,11 +192,9 @@ class TestAccountJournalPeriodClose(common.TransactionCase): context = {} jour_per_obj = self.registry('account.journal.period') - journal_id = self.ref('account.sales_journal') - period_id = self.ref('account.period_1') move_values = get_simple_account_move_values(self, - period_id, - journal_id) + self.period_id, + self.journal_id) self.registry('account.move').create(self.cr, self.uid, move_values, @@ -185,8 +202,8 @@ class TestAccountJournalPeriodClose(common.TransactionCase): journal_period_ids =\ jour_per_obj.search(self.cr, self.uid, - [('period_id', '=', period_id), - ('journal_id', '=', journal_id), + [('period_id', '=', self.period_id), + ('journal_id', '=', self.journal_id), ], context=context) # I check if the exception is correctly raised at closing journal that @@ -198,15 +215,13 @@ class TestAccountJournalPeriodClose(common.TransactionCase): def test_duplicate_journal_period(self): context = {} - journal_id = self.ref('account.sales_journal') - period_id = self.ref('account.period_1') - create_journal_period(self, period_id, journal_id, context) + create_journal_period(self, self.period_id, self.journal_id, context) # I check if the exception is correctly raised at adding both same # journal on a period self.cr._default_log_exceptions = False try: self.assertRaises(IntegrityError, create_journal_period, - self, period_id, journal_id, context) + self, self.period_id, self.journal_id, context) finally: self.cr._default_log_exceptions = True