Link closing balances on account transactions report

This commit is contained in:
RunasSudo 2020-07-17 11:32:49 +10:00
parent 0a8e982bf9
commit bf4cc42533
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 13 additions and 9 deletions

View File

@ -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 %}
<tr class="total trn-first trn-last">
<td>{{ date_end.strftime('%Y-%m-%d') }}</td>
<td>Closing Balance</td>
<td><a href="{{ nextlink }}">{{ date_end.strftime('%Y-%m-%d') }}</a></td>
<td><a href="{{ nextlink }}">Closing Balance</a></td>
<td></td>
<td style="text-align: right;"></td>
<td style="text-align: right;"></td>
<td style="text-align: right;">
{% if closing_balance >= 0 %}
{{ closing_balance|b }} Dr
{% else %}
{{ -closing_balance|b }} Cr
{% endif %}
<a href="{{ nextlink }}">
{% if closing_balance >= 0 %}
{{ closing_balance|b }} Dr
{% else %}
{{ -closing_balance|b }} Cr
{% endif %}
</a>
</td>
</tr>
{% else %}

View File

@ -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 %}
<tr class="total explicit-rules{% if loop.first %} trn-first{% endif %}{% if loop.last %} trn-last{% endif %}" style="{% if loop.first %}border-top: 1pt solid black;{% endif %}{% if loop.last %}border-bottom: 1pt solid black;{% endif %}">
<td>{% if loop.first %}{{ date_end.strftime('%Y-%m-%d') }}{% endif %}</td>
<td>{% if loop.first %}Closing Balance{% endif %}</td>
<td>{% if loop.first %}<a href="{{ nextlink }}">{{ date_end.strftime('%Y-%m-%d') }}</a>{% endif %}</td>
<td>{% if loop.first %}<a href="{{ nextlink }}">Closing Balance</a>{% endif %}</td>
<td></td>
<td></td>
<td></td>