From 810ecea0ba5b319c1c3ba4200bc9cb3f48b51764 Mon Sep 17 00:00:00 2001 From: Frederik Jaeckel Date: Tue, 16 Aug 2022 16:45:32 +0200 Subject: [PATCH] test korrigiert --- book.py | 4 ---- tests/test_book.py | 28 ++++++++++++++++++++++++++++ tests/test_line.py | 16 ++++++++++++++++ tests/test_reconciliation.py | 9 +++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/book.py b/book.py index fa0fed5..6484f34 100644 --- a/book.py +++ b/book.py @@ -124,10 +124,6 @@ class Book(Workflow, ModelSQL, ModelView): def default_number_atcheck(cls): return True - @classmethod - def default_start_number(cls): - return 1 - @classmethod def default_start_balance(cls): """ zero diff --git a/tests/test_book.py b/tests/test_book.py index 580603b..b2d2a72 100644 --- a/tests/test_book.py +++ b/tests/test_book.py @@ -15,6 +15,25 @@ class BookTestCase(ModuleTestCase): 'Test cashbook book module' module = 'cashbook' + def prep_sequence(self, name='Book Sequ'): + """ create numbering-equence + """ + pool = Pool() + IrSequence = pool.get('ir.sequence') + IrSequType = pool.get('ir.sequence.type') + + sequ_type, = IrSequType.search([('name', '=', 'Cashbook Line')]) + + sequ = IrSequence.search([('name', '=', name)]) + if len(sequ) > 0: + return sequ[0] + + sequ, = IrSequence.create([{ + 'name': name, + 'sequence_type': sequ_type.id, + }]) + return sequ + @with_transaction() def test_book_create(self): """ create cashbook @@ -29,6 +48,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) self.assertEqual(book.name, 'Book 1') self.assertEqual(book.btype.rec_name, 'CAS - Cash') @@ -51,6 +71,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'test 1', @@ -84,6 +105,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'test 1', @@ -119,6 +141,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'test 1', @@ -150,6 +173,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) self.assertEqual(book.name, 'Book 1') self.assertEqual(book.state, 'open') @@ -214,6 +238,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) self.assertEqual(book.name, 'Book 1') self.assertEqual(book.start_balance, Decimal('0.0')) @@ -288,6 +313,7 @@ class BookTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) self.assertEqual(book.rec_name, 'Fridas book | 0.00 usd | Open'), self.assertEqual(book.owner.rec_name, 'Frida'), @@ -358,6 +384,7 @@ class BookTestCase(ModuleTestCase): 'company': company.id, 'currency': company.currency.id, 'btype': types.id, + 'number_sequ': self.prep_sequence().id, }]) self.assertEqual(book.rec_name, 'Fridas book | 0.00 usd | Open'), self.assertEqual(book.owner.rec_name, 'Frida'), @@ -420,6 +447,7 @@ class BookTestCase(ModuleTestCase): 'company': company.id, 'currency': company.currency.id, 'btype': types.id, + 'number_sequ': self.prep_sequence().id, }]) self.assertEqual(book.rec_name, 'Fridas book | 0.00 usd | Open'), self.assertEqual(book.owner.rec_name, 'Frida'), diff --git a/tests/test_line.py b/tests/test_line.py index 40654f4..e0f51bd 100644 --- a/tests/test_line.py +++ b/tests/test_line.py @@ -33,6 +33,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -113,6 +114,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -184,6 +186,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -250,6 +253,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) book, = Book.create([{ @@ -257,6 +261,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Transfer Out', @@ -312,6 +317,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) book, = Book.create([{ @@ -319,6 +325,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Transfer In', @@ -380,6 +387,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) book, = Book.create([{ @@ -387,6 +395,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Revenue', @@ -521,6 +530,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -572,6 +582,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -611,6 +622,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -655,6 +667,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -722,6 +735,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Test 1', @@ -802,6 +816,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Test 1', @@ -888,6 +903,7 @@ class LineTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Test 1', diff --git a/tests/test_reconciliation.py b/tests/test_reconciliation.py index 375e4aa..a25669b 100644 --- a/tests/test_reconciliation.py +++ b/tests/test_reconciliation.py @@ -31,6 +31,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, }]) recon1, = Reconciliation.create([{ @@ -178,6 +179,7 @@ class ReconTestCase(ModuleTestCase): 'company': company.id, 'currency': company.currency.id, 'start_balance': Decimal('12.50'), + 'number_sequ': self.prep_sequence().id, 'reconciliations': [('create', [{ 'date': date(2022, 5, 28), 'date_from': date(2022, 5, 1), @@ -209,6 +211,7 @@ class ReconTestCase(ModuleTestCase): 'company': company.id, 'currency': company.currency.id, 'start_balance': Decimal('12.50'), + 'number_sequ': self.prep_sequence().id, 'reconciliations': [('create', [{ 'date': date(2022, 5, 28), 'date_from': date(2022, 5, 1), @@ -267,6 +270,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'reconciliations': [('create', [{ 'date': date(2022, 5, 28), 'date_from': date(2022, 5, 1), @@ -304,6 +308,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'reconciliations': [('create', [{ 'date': date(2022, 5, 28), 'date_from': date(2022, 5, 1), @@ -353,6 +358,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -493,6 +499,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -554,6 +561,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1', @@ -616,6 +624,7 @@ class ReconTestCase(ModuleTestCase): 'btype': types.id, 'company': company.id, 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, 'lines': [('create', [{ 'date': date(2022, 5, 1), 'description': 'Text 1',