starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-07-09 14:25:25 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

fix: wrong calculations

Browse Source
This commit is contained in:
Herculino Trotta
2024-11-18 01:17:37 -03:00
parent ea480c5954
commit c9b4cd3408
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/apps/yearly_overview/views.py
+6 -4
View File
@@ -72,8 +72,10 @@ def yearly_overview_by_currency(request, year: int):
if currency:
filter_params["account__currency_id"] = int(currency)
transactions = Transaction.objects.filter(**filter_params).exclude(
Q(category__mute=True) & ~Q(category=None)
transactions = (
Transaction.objects.filter(**filter_params)
.exclude(Q(category__mute=True) & ~Q(category=None))
.order_by("account__group__name", "account__name")
)
data = calculate_currency_totals(transactions)
@@ -144,8 +146,8 @@ def yearly_overview_by_account(request, year: int):
if account:
filter_params["account_id"] = int(account)
transactions = Transaction.objects.filter(**filter_params).order_by(
"account__group__name", "account__name", "id"
transactions = Transaction.objects.filter(**filter_params).exclude(
Q(category__mute=True) & ~Q(category=None)
)
data = calculate_account_totals(transactions)