From 229e01a3d94efd7b9d7280a4df2d25b6358a9e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 16 Jul 2020 23:50:32 +0800 Subject: [PATCH] Revised the template of the cash summary for long lines in the accounting application. --- .../templates/accounting/cash_summary.html | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/accounting/templates/accounting/cash_summary.html b/accounting/templates/accounting/cash_summary.html index e79cd13..b39715c 100644 --- a/accounting/templates/accounting/cash_summary.html +++ b/accounting/templates/accounting/cash_summary.html @@ -69,11 +69,15 @@ First written: 2020/7/15
{% trans "Shortcuts" context "Accounting|Subject|" as text %}{{ text|force_escape }}
{% for subject in shortcut_subjects %} - {{ subject.title|title }} + + {{ subject.title|title }} + {% endfor %}
{% trans "All" context "Accounting|Subject|" as text %}{{ text|force_escape }}
{% for subject in all_sibjects %} - {{ subject.title|title }} + + {{ subject.code }} {{ subject.title|title }} + {% endfor %}
@@ -123,20 +127,36 @@ First written: 2020/7/15 {{ record.label }}
- {{ record.credit_amount|accounting_amount }} - {{ record.debit_amount|accounting_amount }} - {{ record.balance|intcomma:False }} - {{ record.cumulative_balance|intcomma:False }} + + {{ record.credit_amount|accounting_amount }} + + + {{ record.debit_amount|accounting_amount }} + + + {{ record.balance|intcomma:False }} + + + {{ record.cumulative_balance|intcomma:False }} +
{% else %}
{{ record.label }}
- {{ record.credit_amount|accounting_amount }} - {{ record.debit_amount|accounting_amount }} - {{ record.balance|intcomma:False }} - {{ record.cumulative_balance|intcomma:False }} + + {{ record.credit_amount|accounting_amount }} + + + {{ record.debit_amount|accounting_amount }} + + + {{ record.balance|intcomma:False }} + + + {{ record.cumulative_balance|intcomma:False }} +
{% endif %}