From bf4cc42533365e78d7372d8dae0e27e72ba7e77b Mon Sep 17 00:00:00 2001 From: RunasSudo Date: Fri, 17 Jul 2020 11:32:49 +1000 Subject: [PATCH] Link closing balances on account transactions report --- ledger_pyreport/jinja2/transactions.html | 17 ++++++++++------- .../jinja2/transactions_commodity.html | 5 +++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ledger_pyreport/jinja2/transactions.html b/ledger_pyreport/jinja2/transactions.html index 95bd639..2adb8bc 100644 --- a/ledger_pyreport/jinja2/transactions.html +++ b/ledger_pyreport/jinja2/transactions.html @@ -136,18 +136,21 @@ {% endfor %} {% if account %} + {% set nextlink = '/transactions?' + {'date_beg': (date_end + timedelta(days=1)).strftime('%Y-%m-%d'), 'date_end': date_end.replace(year=date_end.year+1).strftime('%Y-%m-%d'), 'account': account.name, 'cash': 'on' if cash else ''}|urlencode %} - {{ date_end.strftime('%Y-%m-%d') }} - Closing Balance + {{ date_end.strftime('%Y-%m-%d') }} + Closing Balance - {% if closing_balance >= 0 %} - {{ closing_balance|b }} Dr - {% else %} - {{ -closing_balance|b }} Cr - {% endif %} + + {% if closing_balance >= 0 %} + {{ closing_balance|b }} Dr + {% else %} + {{ -closing_balance|b }} Cr + {% endif %} + {% else %} diff --git a/ledger_pyreport/jinja2/transactions_commodity.html b/ledger_pyreport/jinja2/transactions_commodity.html index 8a4055d..1cae983 100644 --- a/ledger_pyreport/jinja2/transactions_commodity.html +++ b/ledger_pyreport/jinja2/transactions_commodity.html @@ -88,10 +88,11 @@ {% set ns.balance = ns.balance.clean() %} {% endfor %} + {% set nextlink = '/transactions?' + {'date_beg': (date_end + timedelta(days=1)).strftime('%Y-%m-%d'), 'date_end': date_end.replace(year=date_end.year+1).strftime('%Y-%m-%d'), 'account': account.name, 'cash': 'on' if cash else ''}|urlencode %} {% for amount in closing_balance.amounts %} - {% if loop.first %}{{ date_end.strftime('%Y-%m-%d') }}{% endif %} - {% if loop.first %}Closing Balance{% endif %} + {% if loop.first %}{{ date_end.strftime('%Y-%m-%d') }}{% endif %} + {% if loop.first %}Closing Balance{% endif %}