From fe1e4a40be73dafff0f25ad1b8e166fb7d4eb8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Sat, 8 Aug 2020 13:53:48 +0800 Subject: [PATCH] Renamed the template variables in the accounting reports to be more meaningful in the accounting application. --- .../templates/accounting/balance-sheet.html | 54 ++++++------- .../templates/accounting/cash-summary.html | 56 +++++++------- accounting/templates/accounting/cash.html | 68 ++++++++--------- .../accounting/income-statement.html | 22 +++--- accounting/templates/accounting/journal.html | 70 ++++++++--------- .../templates/accounting/ledger-summary.html | 64 ++++++++-------- accounting/templates/accounting/ledger.html | 76 +++++++++---------- accounting/templates/accounting/search.html | 48 ++++++------ .../templates/accounting/trial-balance.html | 26 +++---- accounting/views.py | 16 ++-- 10 files changed, 250 insertions(+), 250 deletions(-) diff --git a/accounting/templates/accounting/balance-sheet.html b/accounting/templates/accounting/balance-sheet.html index fbd58a9..1399795 100644 --- a/accounting/templates/accounting/balance-sheet.html +++ b/accounting/templates/accounting/balance-sheet.html @@ -88,12 +88,12 @@ First written: 2020/7/20 - {% for item in group.details %} + {% for account in group.details %} -
{{ item.title|title_case }}
- {{ item.amount|accounting_amount }} +
{{ account.title|title_case }}
+ {{ account.amount|accounting_amount }} - + {{ _("View")|force_escape }} @@ -119,12 +119,12 @@ First written: 2020/7/20 - {% for item in group.details %} + {% for account in group.details %} -
{{ item.title|title_case }}
- {{ item.amount|accounting_amount }} +
{{ account.title|title_case }}
+ {{ account.amount|accounting_amount }} - + {{ _("View")|force_escape }} @@ -156,12 +156,12 @@ First written: 2020/7/20 - {% for item in group.details %} + {% for account in group.details %} -
{{ item.title|title_case }}
- {{ item.amount|accounting_amount }} +
{{ account.title|title_case }}
+ {{ account.amount|accounting_amount }} - + {{ _("View")|force_escape }} @@ -227,13 +227,13 @@ First written: 2020/7/20
  • {{ group.title|title_case }}
  • - {% for item in group.details %} + {% for account in group.details %}
  • - - {{ item.title|title_case }} + + {{ account.title|title_case }}
    - - {{ item.amount|accounting_amount }} + + {{ account.amount|accounting_amount }}
    @@ -258,13 +258,13 @@ First written: 2020/7/20
  • {{ group.title|title_case }}
  • - {% for item in group.details %} + {% for account in group.details %}
  • - - {{ item.title|title_case }} + + {{ account.title|title_case }}
    - - {{ item.amount|accounting_amount }} + + {{ account.amount|accounting_amount }}
    @@ -287,13 +287,13 @@ First written: 2020/7/20
  • {{ group.title|title_case }}
  • - {% for item in group.details %} + {% for account in group.details %}
  • - - {{ item.title|title_case }} + + {{ account.title|title_case }}
    - - {{ item.amount|accounting_amount }} + + {{ account.amount|accounting_amount }}
    diff --git a/accounting/templates/accounting/cash-summary.html b/accounting/templates/accounting/cash-summary.html index 05d0c78..221ec28 100644 --- a/accounting/templates/accounting/cash-summary.html +++ b/accounting/templates/accounting/cash-summary.html @@ -77,7 +77,7 @@ First written: 2020/7/15 -{% if item_list %} +{% if month_list %} {% include "mia_core/include/pagination.html" %} {# The table for large screens #} @@ -93,16 +93,16 @@ First written: 2020/7/15 - {% for item in item_list %} - - {{ item.label }} - {{ item.credit|accounting_amount }} - {{ item.debit|accounting_amount }} - {{ item.balance|accounting_amount }} - {{ item.cumulative_balance|accounting_amount }} + {% for month in month_list %} + + {{ month.label }} + {{ month.credit|accounting_amount }} + {{ month.debit|accounting_amount }} + {{ month.balance|accounting_amount }} + {{ month.cumulative_balance|accounting_amount }} - {% if item.month is not None %} - + {% if month.month is not None %} + {{ _("View")|force_escape }} @@ -115,41 +115,41 @@ First written: 2020/7/15 {# The list for small screens #}