imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Changed the URL of the accounts in the balance sheet so that the net income in the current period links to the income statement in the accounting application.

Browse Source
This commit is contained in:
依瑪貓
2020-07-21 13:38:18 +08:00
parent 3c294ffcb8
commit bbfe9e7892
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accounting/views/reports.py
View File

@ -738,6 +738,9 @@ def balance_sheet(request, period_spec):
When(record__is_credit=True, then=-1),
default=1) * F("record__amount")))
.filter(balance__isnull=False))
for account in accounts:
account.url = reverse(
"accounting:ledger", args=[account.code, period.spec])
balance = Record.objects\
.filter(
Q(transaction__date__lt=period.start)
@ -752,6 +755,8 @@ def balance_sheet(request, period_spec):
if balance is not None and balance != 0:
brought_forward = Account.objects.get(code="3351")
brought_forward.balance = -balance
brought_forward.url = reverse(
"accounting:income-statement", args=[period.spec])
accounts.append(brought_forward)
balance = Record.objects\
.filter(
@ -768,6 +773,8 @@ def balance_sheet(request, period_spec):
if balance is not None and balance != 0:
net_income = Account.objects.get(code="3353")
net_income.balance = -balance
net_income.url = reverse(
"accounting:income-statement", args=[period.spec])
accounts.append(net_income)
groups = list(Account.objects.filter(
code__in=[x.code[:2] for x in accounts]))