starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-03-17 23:13:57 +01: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 10:08:54 -03:00
parent c9b4cd3408
commit 1544c6cca2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/apps/transactions/utils/calculations.py
View File

@@ -163,7 +163,6 @@ def calculate_account_totals(transactions_queryset, ignore_empty=False):
"account__currency__prefix",
"account__currency__suffix",
"account__exchange_currency",
"id",
).annotate(
expense_current=Coalesce(
Sum(

9
app/apps/yearly_overview/views.py
View File

@@ -146,8 +146,13 @@ def yearly_overview_by_account(request, year: int):
if account:
filter_params["account_id"] = int(account)
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_account_totals(transactions)