diff --git a/drcr/models.py b/drcr/models.py index 2494387..7c6390b 100644 --- a/drcr/models.py +++ b/drcr/models.py @@ -129,6 +129,10 @@ class TrialBalancer: # TODO: Keep a record of internal transactions? + if source_account == destination_account: + # Don't do anything in this case!! + return + if source_account not in self.accounts: return diff --git a/drcr/reports/views.py b/drcr/reports/views.py index 331cd5c..d42e2bc 100644 --- a/drcr/reports/views.py +++ b/drcr/reports/views.py @@ -16,13 +16,12 @@ from flask import render_template -from ..config import BALANCE_SHEET_MAPPING, COA_MAPPING +from ..config import BALANCE_SHEET_MAPPING, COA_MAPPING, INCOME_STATEMENT_MAPPING from ..models import Amount, TrialBalancer from ..webapp import all_transactions, app -@app.route('/reports/balance-sheet') -def balance_sheet(): - # Extract trial balance +def get_trial_balance(): + # Get trial balance and validate COA balancer = TrialBalancer() balancer.apply_transactions(all_transactions()) @@ -30,7 +29,50 @@ def balance_sheet(): for source_account, destination_account in COA_MAPPING.items(): balancer.transfer_balance(source_account, destination_account) - balancer.transfer_balance('Income', 'Current year surplus (deficit)') - balancer.transfer_balance('Expenses', 'Current year surplus (deficit)') + return balancer + + # Validate COA + for account in balancer.accounts: + if account in BALANCE_SHEET_MAPPING['Current assets']: + continue + if account in BALANCE_SHEET_MAPPING['Non-current assets']: + continue + if account in BALANCE_SHEET_MAPPING['Current liabilities']: + continue + if account in BALANCE_SHEET_MAPPING['Non-current liabilities']: + continue + if account in INCOME_STATEMENT_MAPPING['Income']: + continue + if account in INCOME_STATEMENT_MAPPING['Expenses']: + continue + if account == 'Accumulated surplus (deficit)': + continue + + raise Exception('Account "{}" is not mapped to a report'.format(account)) + + return balancer + +#@app.route('/reports/mapped-trial-balance') +#def mapped_trial_balance(): +# balancer = get_trial_balance() +# +# 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) + +@app.route('/reports/balance-sheet') +def balance_sheet(): + balancer = get_trial_balance() + + # Transfer surplus to balance sheet + for account in INCOME_STATEMENT_MAPPING['Income'] + INCOME_STATEMENT_MAPPING['Expenses']: + balancer.transfer_balance(account, 'Current year surplus (deficit)') return render_template('reports/balance_sheet.html', accounts=balancer.accounts, running_total=Amount(0, '$'), BALANCE_SHEET_MAPPING=BALANCE_SHEET_MAPPING) + +@app.route('/reports/income-statement') +def income_statement(): + balancer = get_trial_balance() + + return render_template('reports/income_statement.html', accounts=balancer.accounts, running_total=Amount(0, '$'), INCOME_STATEMENT_MAPPING=INCOME_STATEMENT_MAPPING) diff --git a/drcr/templates/index.html b/drcr/templates/index.html index b831fcc..f475053 100644 --- a/drcr/templates/index.html +++ b/drcr/templates/index.html @@ -35,5 +35,6 @@
+ | $ | +
---|---|
Income | +|
Total income | +{{ fmtbal(running_total, -1) }} | +
Expenses | +|
Total expenses | +{{ fmtbal(running_total) }} | +
Net surplus (deficit) | + {% set _ = running_total.__setattr__('quantity', surplus) %} +{{ fmtbal(running_total, -1) }} | +