mdsfred/cashbook_investment
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix amounts on view-cashbooks to include non-asset-cashbooks

Browse source
This commit is contained in:
Frederik Jaeckel 2024-01-20 18:15:31 +01:00
parent d8ff106f48
commit f173dee817
4 changed files with 234 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

44
tests/book.py
View file

@ -49,7 +49,7 @@ class CbInvTestCase(object):
self.assertEqual(book.show_performance, True)
# run sorter
books = Book.search(
Book.search(
[],
order=[
('current_value', 'ASC'),
@ -103,6 +103,12 @@ class CbInvTestCase(object):
asset.rec_name, 'Product 1 | 12.5000 usd/u | 05/02/2022')
(usd, euro) = self.prep_2nd_currency(company)
self.assertEqual(len(usd.rates), 1)
self.assertEqual(usd.rates[0].rate, Decimal('1.05'))
self.assertEqual(usd.rates[0].date, date(2022, 5, 2))
self.assertEqual(euro.rates[0].rate, Decimal('1.0'))
self.assertEqual(euro.rates[0].date, date(2022, 5, 2))
self.assertEqual(company.currency.rec_name, 'Euro')
BType.write(*[
@ -182,26 +188,35 @@ class CbInvTestCase(object):
}])],
}])],
}])
self.prep_valstore_run_worker()
self.assertEqual(len(books), 1)
self.assertEqual(books[0].rec_name, 'L0-Euro-None')
self.assertEqual(books[0].balance, Decimal('58.57'))
self.assertEqual(books[0].balance_ref, Decimal('58.57'))
# balance of asset-books: 29,286 €
# value of asset-books: 11.9€ + 12.5USD/1.05 = 23.8€
self.assertEqual(books[0].current_value, Decimal('23.8'))
self.assertEqual(books[0].current_value_ref, Decimal('23.8'))
# current_value:
# +15€ (15.00€ - L1-Euro-Cash)
# +15$ / 1.05 (14.29€ - L1-USD-Cash)
# +12.5$/1.05 (11.90€ - L1-Euro-Depot)
# +12.5$/1.05 (11.90€ - L1-USD-Depot)
# = 53.09€
self.assertEqual(books[0].current_value, Decimal('53.09'))
self.assertEqual(books[0].current_value_ref, Decimal('53.09'))
self.assertEqual(books[0].purchase_amount, Decimal('58.58'))
self.assertEqual(books[0].diff_amount, Decimal('-5.49'))
self.assertEqual(books[0].diff_percent, Decimal('-18.74'))
self.assertEqual(books[0].diff_percent, Decimal('-9.37'))
# searcher
self.assertEqual(Book.search_count([
('current_value', '=', Decimal('23.8'))]), 1)
('current_value', '=', Decimal('53.09'))]), 1)
self.assertEqual(Book.search_count([
('current_value_ref', '=', Decimal('23.8'))]), 1)
('current_value_ref', '=', Decimal('53.09'))]), 1)
self.assertEqual(Book.search_count([
('diff_amount', '=', Decimal('-5.49'))]), 1)
self.assertEqual(Book.search_count([
('diff_percent', '=', Decimal('-18.74'))]), 1)
('diff_percent', '=', Decimal('-9.37'))]), 1)
self.assertEqual(Book.search_count([
('quantity', '=', Decimal('1.0'))]), 2)
self.assertEqual(Book.search_count([
@ -209,15 +224,17 @@ class CbInvTestCase(object):
self.assertEqual(Book.search_count([
('current_rate', '=', Decimal('11.9'))]), 1)
self.assertEqual(Book.search_count([
('purchase_amount', '=', Decimal('15.0'))]), 2)
('purchase_amount', '=', Decimal('15.0'))]), 4)
self.assertEqual(len(books[0].childs), 4)
self.assertEqual(
books[0].childs[0].rec_name,
'L0-Euro-None/L1-Euro-Cash | 15.00 € | Open')
self.assertEqual(books[0].childs[0].current_value, None)
self.assertEqual(books[0].childs[0].current_value_ref, None)
self.assertEqual(
books[0].childs[0].current_value, Decimal('15.0'))
self.assertEqual(
books[0].childs[0].current_value_ref, Decimal('15.0'))
self.assertEqual(books[0].childs[0].diff_amount, None)
self.assertEqual(books[0].childs[0].diff_percent, None)
@ -227,6 +244,7 @@ class CbInvTestCase(object):
self.assertEqual(
books[0].childs[1].asset.rec_name,
'Product 1 | 12.5000 usd/u | 05/02/2022')
# asset: usd, rate 12.50 usd/u @ 2022-05-02
self.assertEqual(
books[0].childs[1].current_value, Decimal('11.9'))
self.assertEqual(
@ -239,8 +257,10 @@ class CbInvTestCase(object):
self.assertEqual(
books[0].childs[2].rec_name,
'L0-Euro-None/L1-USD-Cash | 15.00 usd | Open')
self.assertEqual(books[0].childs[2].current_value, None)
self.assertEqual(books[0].childs[2].current_value_ref, None)
self.assertEqual(
books[0].childs[2].current_value, Decimal('15.0'))
self.assertEqual(
books[0].childs[2].current_value_ref, Decimal('14.29'))
self.assertEqual(books[0].childs[2].diff_amount, None)
self.assertEqual(books[0].childs[2].diff_percent, None)