diff --git a/drcr/reports/views.py b/drcr/reports/views.py index efd0a2f..331cd5c 100644 --- a/drcr/reports/views.py +++ b/drcr/reports/views.py @@ -16,7 +16,7 @@ from flask import render_template -from ..config import COA_MAPPING +from ..config import BALANCE_SHEET_MAPPING, COA_MAPPING from ..models import Amount, TrialBalancer from ..webapp import all_transactions, app @@ -30,10 +30,7 @@ def balance_sheet(): for source_account, destination_account in COA_MAPPING.items(): balancer.transfer_balance(source_account, destination_account) - balancer.transfer_balance('Income', 'Equity') - balancer.transfer_balance('Expenses', 'Equity') + balancer.transfer_balance('Income', 'Current year surplus (deficit)') + balancer.transfer_balance('Expenses', 'Current year surplus (deficit)') - total_dr = Amount(sum(v.quantity for v in balancer.accounts.values() if v.quantity > 0), '$') - total_cr = Amount(sum(v.quantity for v in balancer.accounts.values() if v.quantity < 0), '$') - - return render_template('trial_balance.html', accounts=dict(sorted(balancer.accounts.items())), total_dr=total_dr, total_cr=total_cr) + return render_template('reports/balance_sheet.html', accounts=balancer.accounts, running_total=Amount(0, '$'), BALANCE_SHEET_MAPPING=BALANCE_SHEET_MAPPING) diff --git a/drcr/templates/base.html b/drcr/templates/base.html index d5fe7db..ae42812 100644 --- a/drcr/templates/base.html +++ b/drcr/templates/base.html @@ -26,9 +26,16 @@ {% block body %} -