diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 23d563d..ea4c8e0 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -250,6 +250,9 @@ Mreturn of bottles Category.create([{ 'name': 'Lebensmittel', 'cattype': 'out', + }, { + 'name': 'Fee', + 'cattype': 'out', }]) (sess_id, start_state, end_state) = ImportWiz.create() @@ -338,7 +341,21 @@ T7,30 CX PTransfer to book L[From Book] -^""".encode('utf8') +^ +D06.12.2013 +T-10,00 +CX +PFoodshop Zehlendorf +MSplitbooking with category and account +LFee +SFee +EFee for transfer +$-3,00 +S[From Book] +ETransfer to From-Book +$-7,00 +^ +""".encode('utf8') r1['company'] = company.id r1['book'] = books[1].id w_obj.start.file_ = r1['file_'] @@ -352,9 +369,9 @@ L[From Book] self.assertEqual(result['view']['defaults']['info'], """The following transactionen are now imported: Credit: usd0.00 -Debit: usd10.00 -Balance: -usd10.00 -Number of transactions: 1""") +Debit: usd20.00 +Balance: -usd20.00 +Number of transactions: 2""") r1 = { 'company': company.id, @@ -365,16 +382,21 @@ Number of transactions: 1""") ImportWiz.delete(sess_id) - self.assertEqual(len(books[0].lines), 2) - self.assertEqual(len(books[1].lines), 2) + self.assertEqual(len(books[0].lines), 3) + self.assertEqual(len(books[1].lines), 3) - self.assertEqual(books[0].lines[0].rec_name, '12/04/2013|to|-7.30 usd|Transfer to book [To Book | -2.70 usd | Open]') + self.assertEqual(books[0].lines[0].rec_name, '12/04/2013|to|-7.30 usd|Transfer to book [To Book | -12.70 usd | Open]') self.assertEqual(books[0].lines[0].state, 'check') self.assertEqual(books[0].lines[1].rec_name, '12/05/2013|Exp|-50.25 usd|some food [Lebensmittel]') self.assertEqual(books[0].lines[1].state, 'check') - self.assertEqual(books[1].lines[0].rec_name, '12/04/2013|from|7.30 usd|Transfer to book [From Book | -57.55 usd | Open]') + self.assertEqual(books[0].lines[2].rec_name, '12/06/2013|from|7.00 usd|Transfer to From-Book [To Book | -12.70 usd | Open]') + self.assertEqual(books[0].lines[2].state, 'check') + + self.assertEqual(books[1].lines[0].rec_name, '12/04/2013|from|7.30 usd|Transfer to book [From Book | -50.55 usd | Open]') self.assertEqual(books[1].lines[0].state, 'check') - self.assertEqual(books[1].lines[1].rec_name, '12/10/2013|Exp|-10.00 usd|some food [Lebensmittel]') + self.assertEqual(books[1].lines[1].rec_name, '12/06/2013|Exp/Sp|-10.00 usd|Splitbooking with category and account [-]') self.assertEqual(books[1].lines[1].state, 'check') + self.assertEqual(books[1].lines[2].rec_name, '12/10/2013|Exp|-10.00 usd|some food [Lebensmittel]') + self.assertEqual(books[1].lines[2].state, 'check') # end PartyTestCase