From f6c6ee7fe419a59028483385d6423d226be86d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 6 Aug 2020 23:55:24 +0800 Subject: [PATCH] Applied the force_escape filter to the gettext shortcut _("...") in the templates, because it returns SafeString instead of str. --- .../templates/accounting/balance-sheet.html | 22 ++++---- .../templates/accounting/cash-summary.html | 20 ++++---- accounting/templates/accounting/cash.html | 38 +++++++------- .../accounting/include/report-chooser.html | 30 +++++------ .../accounting/include/summary-helper.html | 36 ++++++------- .../accounting/income-statement.html | 12 ++--- accounting/templates/accounting/journal.html | 26 +++++----- .../templates/accounting/ledger-summary.html | 16 +++--- accounting/templates/accounting/ledger.html | 34 ++++++------- accounting/templates/accounting/search.html | 26 +++++----- .../accounting/transactions/expense/form.html | 8 +-- .../accounting/transactions/expense/view.html | 36 ++++++------- .../accounting/transactions/income/form.html | 8 +-- .../accounting/transactions/income/view.html | 36 ++++++------- .../accounting/transactions/sort.html | 20 ++++---- .../transactions/transfer/form.html | 14 +++--- .../transactions/transfer/view.html | 50 +++++++++---------- .../templates/accounting/trial-balance.html | 14 +++--- .../mia_core/include/period-chooser.html | 4 +- 19 files changed, 225 insertions(+), 225 deletions(-) diff --git a/accounting/templates/accounting/balance-sheet.html b/accounting/templates/accounting/balance-sheet.html index 43e15ca..b818db6 100644 --- a/accounting/templates/accounting/balance-sheet.html +++ b/accounting/templates/accounting/balance-sheet.html @@ -93,7 +93,7 @@ First written: 2020/7/20 - {{ _("View") }} + {{ _("View")|force_escape }} @@ -124,7 +124,7 @@ First written: 2020/7/20 - {{ _("View") }} + {{ _("View")|force_escape }} @@ -133,7 +133,7 @@ First written: 2020/7/20 - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ liabilities.amount|accounting_amount }} @@ -161,7 +161,7 @@ First written: 2020/7/20 - {{ _("View") }} + {{ _("View")|force_escape }} @@ -170,7 +170,7 @@ First written: 2020/7/20 - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ owners_equity.amount|accounting_amount }} @@ -185,7 +185,7 @@ First written: 2020/7/20 - + @@ -198,7 +198,7 @@ First written: 2020/7/20
{{ _("Total") }}{{ _("Total")|force_escape }} {{ assets.amount|accounting_amount }}
- + @@ -239,7 +239,7 @@ First written: 2020/7/20 {% endfor %} {% endfor %}
  • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ assets.amount|accounting_amount }} @@ -270,7 +270,7 @@ First written: 2020/7/20 {% endfor %} {% endfor %}
  • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ liabilities.amount|accounting_amount }} @@ -299,7 +299,7 @@ First written: 2020/7/20 {% endfor %} {% endfor %}
  • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ owners_equity.amount|accounting_amount }} @@ -308,7 +308,7 @@ First written: 2020/7/20
  • {{ _("Total") }}{{ _("Total")|force_escape }} {{ liabilities.amount|add:owners_equity.amount|accounting_amount }}
    - - - - - - + + + + + + @@ -104,7 +104,7 @@ First written: 2020/7/15 {% if item.month is not None %} - {{ _("View") }} + {{ _("View")|force_escape }} {% endif %} diff --git a/accounting/templates/accounting/cash.html b/accounting/templates/accounting/cash.html index 157090a..e6075b5 100644 --- a/accounting/templates/accounting/cash.html +++ b/accounting/templates/accounting/cash.html @@ -39,17 +39,17 @@ First written: 2020/7/1
    @@ -59,16 +59,16 @@ First written: 2020/7/1
    {{ _("Month") }}{{ _("Income") }}{{ _("Expense") }}{{ _("Balance") }}{{ _("Cumulative Balance") }}{{ _("View") }}{{ _("Month")|force_escape }}{{ _("Income")|force_escape }}{{ _("Expense")|force_escape }}{{ _("Balance")|force_escape }}{{ _("Cumulative Balance")|force_escape }}{{ _("View")|force_escape }}
    - - - - - - - + + + + + + + @@ -108,11 +108,11 @@ First written: 2020/7/1 @@ -122,7 +122,7 @@ First written: 2020/7/1 {% if item.pk is not None %} - {{ _("View") }} + {{ _("View")|force_escape }} {% endif %} @@ -145,12 +145,12 @@ First written: 2020/7/1 {{ item.summary|default:"" }} {% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %} {% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %} diff --git a/accounting/templates/accounting/include/report-chooser.html b/accounting/templates/accounting/include/report-chooser.html index 91da96a..5bd398f 100644 --- a/accounting/templates/accounting/include/report-chooser.html +++ b/accounting/templates/accounting/include/report-chooser.html @@ -30,21 +30,21 @@ First written: 2020/7/9 @@ -59,48 +59,48 @@ First written: 2020/7/9 {{ current_report_title }} - {{ _("Book") }} + {{ _("Book")|force_escape }} diff --git a/accounting/templates/accounting/include/summary-helper.html b/accounting/templates/accounting/include/summary-helper.html index f98f16a..f0bd1b4 100644 --- a/accounting/templates/accounting/include/summary-helper.html +++ b/accounting/templates/accounting/include/summary-helper.html @@ -34,7 +34,7 @@ First written: 2020/4/3 @@ -47,26 +47,26 @@ First written: 2020/4/3
    - +
    @@ -77,20 +77,20 @@ First written: 2020/4/3
    - +
    - +
    - +
    <%="→"%> @@ -98,7 +98,7 @@ First written: 2020/4/3
    - +
    @@ -108,26 +108,26 @@ First written: 2020/4/3
    - +
    - +
    - +
    - +
    @@ -145,7 +145,7 @@ First written: 2020/4/3
    - +
    @@ -155,8 +155,8 @@ First written: 2020/4/3
    diff --git a/accounting/templates/accounting/income-statement.html b/accounting/templates/accounting/income-statement.html index dbb130e..a2cb738 100644 --- a/accounting/templates/accounting/income-statement.html +++ b/accounting/templates/accounting/income-statement.html @@ -77,7 +77,7 @@ First written: 2020/7/19
    - + @@ -105,13 +105,13 @@ First written: 2020/7/19 {% endfor %} - + @@ -119,7 +119,7 @@ First written: 2020/7/19 {% endfor %} {% else %} - + @@ -174,7 +174,7 @@ First written: 2020/7/19 {% endfor %}
  • - {{ _("Total") }} + {{ _("Total")|force_escape }}
    {{ group.amount|accounting_amount }} @@ -184,7 +184,7 @@ First written: 2020/7/19 {% endfor %} {% else %}
  • - {{ _("Total") }} + {{ _("Total")|force_escape }}
    -
    diff --git a/accounting/templates/accounting/journal.html b/accounting/templates/accounting/journal.html index a0c9a10..5243ac9 100644 --- a/accounting/templates/accounting/journal.html +++ b/accounting/templates/accounting/journal.html @@ -72,13 +72,13 @@ First written: 2020/7/17
  • {{ _("Date") }}{{ _("Account") }}{{ _("Summary") }}{{ _("Income") }}{{ _("Expense") }}{{ _("Balance") }}{{ _("View") }}{{ _("Date")|force_escape }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("Income")|force_escape }}{{ _("Expense")|force_escape }}{{ _("Balance")|force_escape }}{{ _("View")|force_escape }}
    {{ item.account.title|title_case }} {{ item.summary|default:"" }}{% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %}{% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %} {{ item.credit_amount|accounting_amount }}
    {{ _("Amount") }}{{ _("Amount")|force_escape }}
    - {{ _("View") }} + {{ _("View")|force_escape }}
    {{ _("Total") }}
    {{ _("Total")|force_escape }}
    {{ group.amount|accounting_amount }}
    {{ _("Total") }}
    {{ _("Total")|force_escape }}
    -
    - - - - - - - + + + + + + + @@ -88,11 +88,11 @@ First written: 2020/7/17 @@ -102,7 +102,7 @@ First written: 2020/7/17 {% if item.pk is not None %} - {{ _("View") }} + {{ _("View")|force_escape }} {% endif %} @@ -126,12 +126,12 @@ First written: 2020/7/17 {{ item.summary|default:"" }} {% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %} {% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %} @@ -161,7 +161,7 @@ First written: 2020/7/17 {{ item.summary|default:"" }} {% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %} diff --git a/accounting/templates/accounting/ledger-summary.html b/accounting/templates/accounting/ledger-summary.html index 860e7fa..46eb272 100644 --- a/accounting/templates/accounting/ledger-summary.html +++ b/accounting/templates/accounting/ledger-summary.html @@ -58,7 +58,7 @@ First written: 2020/7/16
    {{ _("Date") }}{{ _("Account") }}{{ _("Summary") }}{{ _("Debit") }}{{ _("Credit") }}{{ _("Notes") }}{{ _("View") }}{{ _("Date")|force_escape }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("Debit")|force_escape }}{{ _("Credit")|force_escape }}{{ _("Notes")|force_escape }}{{ _("View")|force_escape }}
    {{ item.account.title|title_case }}
    {{ item.summary|default:"" }}{% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %}{% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %}
    {{ item.debit_amount|accounting_amount }}
    - - - - - - + + + + + + @@ -97,7 +97,7 @@ First written: 2020/7/16 {% if item.month is not None %} - {{ _("View") }} + {{ _("View")|force_escape }} {% endif %} diff --git a/accounting/templates/accounting/ledger.html b/accounting/templates/accounting/ledger.html index f8e71e4..db5dff0 100644 --- a/accounting/templates/accounting/ledger.html +++ b/accounting/templates/accounting/ledger.html @@ -59,7 +59,7 @@ First written: 2020/7/16
    {{ _("Month") }}{{ _("Debit") }}{{ _("Credit") }}{{ _("Balance") }}{{ _("Cumulative Balance") }}{{ _("View") }}{{ _("Month")|force_escape }}{{ _("Debit")|force_escape }}{{ _("Credit")|force_escape }}{{ _("Balance")|force_escape }}{{ _("Cumulative Balance")|force_escape }}{{ _("View")|force_escape }}
    - - - - - - - + + + + + + + @@ -101,19 +101,19 @@ First written: 2020/7/16 @@ -123,7 +123,7 @@ First written: 2020/7/16 {% if item.pk is not None %} - {{ _("View") }} + {{ _("View")|force_escape }} {% endif %} @@ -146,22 +146,22 @@ First written: 2020/7/16 {{ item.summary|default:"" }} {% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %} {% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %} {% if not item.is_credit_card_paid %} - {{ _("Unpaid") }} + {{ _("Unpaid")|force_escape }} {% endif %} {% if item.is_existing_equipment %} - {{ _("Existing") }} + {{ _("Existing")|force_escape }} {% endif %} diff --git a/accounting/templates/accounting/search.html b/accounting/templates/accounting/search.html index 0a7ac88..35064a5 100644 --- a/accounting/templates/accounting/search.html +++ b/accounting/templates/accounting/search.html @@ -61,7 +61,7 @@ First written: 2020/7/21 @@ -74,13 +74,13 @@ First written: 2020/7/21
    {{ _("Date") }}{{ _("Account") }}{{ _("Summary") }}{{ _("Debit") }}{{ _("Credit") }}{{ _("Balance") }}{{ _("View") }}{{ _("Date")|force_escape }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("Debit")|force_escape }}{{ _("Credit")|force_escape }}{{ _("Balance")|force_escape }}{{ _("View")|force_escape }}
    {{ item.account.title|title_case }} {{ item.summary|default:"" }}{% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %}{% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %}{% if not item.is_credit_card_paid %} - {{ _("Unpaid") }} + {{ _("Unpaid")|force_escape }} {% endif %}{% if item.is_existing_equipment %} - {{ _("Existing") }} + {{ _("Existing")|force_escape }} {% endif %} {{ item.debit_amount|accounting_amount }}
    - - - - - - - + + + + + + + @@ -90,11 +90,11 @@ First written: 2020/7/21 @@ -103,7 +103,7 @@ First written: 2020/7/21 @@ -125,12 +125,12 @@ First written: 2020/7/21 {{ item.summary|default:"" }} {% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %} {% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %} diff --git a/accounting/templates/accounting/transactions/expense/form.html b/accounting/templates/accounting/transactions/expense/form.html index ce918e2..86bf473 100644 --- a/accounting/templates/accounting/transactions/expense/form.html +++ b/accounting/templates/accounting/transactions/expense/form.html @@ -52,7 +52,7 @@ First written: 2020/7/23 {% csrf_token %}
    - +
    @@ -77,7 +77,7 @@ First written: 2020/7/23
  • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ item.debit_total }}
  • @@ -87,7 +87,7 @@ First written: 2020/7/23
    - +
    @@ -99,7 +99,7 @@ First written: 2020/7/23
    diff --git a/accounting/templates/accounting/transactions/expense/view.html b/accounting/templates/accounting/transactions/expense/view.html index d0fc502..badf916 100644 --- a/accounting/templates/accounting/transactions/expense/view.html +++ b/accounting/templates/accounting/transactions/expense/view.html @@ -35,7 +35,7 @@ First written: 2020/7/23 {% if item.has_order_hole %}
    - {{ _("Error:") }} {{ _("The transactions on this day are not well-ordered. Please reorder them.") }} + {{ _("Error:") }} {{ _("The transactions on this day are not well-ordered. Please reorder them.")|force_escape }}
    {% endif %} @@ -49,17 +49,17 @@ First written: 2020/7/23 - +
    @@ -76,7 +76,7 @@ First written: 2020/7/23 {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} {% if not item.has_many_same_day %} - @@ -96,7 +96,7 @@ First written: 2020/7/23
    -
    {{ _("Date:") }}
    +
    {{ _("Date:")|force_escape }}
    {{ item.date|smart_date }}
    {{ _("Date") }}{{ _("Account") }}{{ _("Summary") }}{{ _("Debit") }}{{ _("Credit") }}{{ _("Notes") }}{{ _("View") }}{{ _("Date")|force_escape }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("Debit")|force_escape }}{{ _("Credit")|force_escape }}{{ _("Notes")|force_escape }}{{ _("View")|force_escape }}
    {{ item.account.title|title_case }}
    {{ item.summary|default:"" }}{% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %}{% if item.has_order_hole %} - {{ _("Need Reorder") }} + {{ _("Need Reorder")|force_escape }} {% endif %}
    {{ item.debit_amount|accounting_amount }} - {{ _("View") }} + {{ _("View")|force_escape }}
    - - - + + + @@ -142,7 +142,7 @@ First written: 2020/7/23 - + @@ -160,7 +160,7 @@ First written: 2020/7/23 {% endfor %}
  • @@ -168,28 +168,28 @@ First written: 2020/7/23 {% if item.notes %}
    -
    {{ _("Notes:") }}
    +
    {{ _("Notes:")|force_escape }}
    {{ item.notes }}
    {% endif %}
    -
    {{ _("Created at:") }}
    +
    {{ _("Created at:")|force_escape }}
    {{ item.created_at }}
    -
    {{ _("Created by:") }}
    +
    {{ _("Created by:")|force_escape }}
    {{ item.created_by.name }}
    -
    {{ _("Updated at:") }}
    +
    {{ _("Updated at:")|force_escape }}
    {{ item.updated_at }}
    -
    {{ _("Updated by:") }}
    +
    {{ _("Updated by:")|force_escape }}
    {{ item.updated_by.name }}
    diff --git a/accounting/templates/accounting/transactions/income/form.html b/accounting/templates/accounting/transactions/income/form.html index 1b2594e..3574b1c 100644 --- a/accounting/templates/accounting/transactions/income/form.html +++ b/accounting/templates/accounting/transactions/income/form.html @@ -52,7 +52,7 @@ First written: 2020/7/23 {% csrf_token %}
    - +
    @@ -77,7 +77,7 @@ First written: 2020/7/23
  • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ item.credit_total }}
  • @@ -87,7 +87,7 @@ First written: 2020/7/23
    - +
    @@ -99,7 +99,7 @@ First written: 2020/7/23
    diff --git a/accounting/templates/accounting/transactions/income/view.html b/accounting/templates/accounting/transactions/income/view.html index 3a630f6..c85bc07 100644 --- a/accounting/templates/accounting/transactions/income/view.html +++ b/accounting/templates/accounting/transactions/income/view.html @@ -35,7 +35,7 @@ First written: 2020/7/23 {% if item.has_order_hole %}
    - {{ _("Error:") }} {{ _("The transactions on this day are not well-ordered. Please reorder them.") }} + {{ _("Error:") }} {{ _("The transactions on this day are not well-ordered. Please reorder them.")|force_escape }}
    {% endif %} @@ -49,17 +49,17 @@ First written: 2020/7/23 - +
    @@ -76,7 +76,7 @@ First written: 2020/7/23 {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} {% if not item.has_many_same_day %} - @@ -96,7 +96,7 @@ First written: 2020/7/23
    -
    {{ _("Date:") }}
    +
    {{ _("Date:")|force_escape }}
    {{ item.date|smart_date }}
    {{ _("Account") }}{{ _("Summary") }}{{ _("$") }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("$")|force_escape }}
    {{ _("Total") }}{{ _("Total")|force_escape }} {{ item.debit_total|accounting_amount }}
    - - - + + + @@ -142,7 +142,7 @@ First written: 2020/7/23 - + @@ -160,7 +160,7 @@ First written: 2020/7/23 {% endfor %}
  • @@ -168,28 +168,28 @@ First written: 2020/7/23 {% if item.notes %}
    -
    {{ _("Notes:") }}
    +
    {{ _("Notes:")|force_escape }}
    {{ item.notes }}
    {% endif %}
    -
    {{ _("Created at:") }}
    +
    {{ _("Created at:")|force_escape }}
    {{ item.created_at }}
    -
    {{ _("Created by:") }}
    +
    {{ _("Created by:")|force_escape }}
    {{ item.created_by.name }}
    -
    {{ _("Updated at:") }}
    +
    {{ _("Updated at:")|force_escape }}
    {{ item.updated_at }}
    -
    {{ _("Updated by:") }}
    +
    {{ _("Updated by:")|force_escape }}
    {{ item.updated_by.name }}
    diff --git a/accounting/templates/accounting/transactions/sort.html b/accounting/templates/accounting/transactions/sort.html index 43f5ebc..7b03a44 100644 --- a/accounting/templates/accounting/transactions/sort.html +++ b/accounting/templates/accounting/transactions/sort.html @@ -46,7 +46,7 @@ First written: 2020/8/6
    - +
    @@ -61,10 +61,10 @@ First written: 2020/8/6
    - - - - + + + + @@ -82,11 +82,11 @@ First written: 2020/8/6 @@ -134,7 +134,7 @@ First written: 2020/8/6
    diff --git a/accounting/templates/accounting/transactions/transfer/form.html b/accounting/templates/accounting/transactions/transfer/form.html index cf80737..fd25e73 100644 --- a/accounting/templates/accounting/transactions/transfer/form.html +++ b/accounting/templates/accounting/transactions/transfer/form.html @@ -52,7 +52,7 @@ First written: 2020/7/23 {% csrf_token %}
    - +
    @@ -62,7 +62,7 @@ First written: 2020/7/23
    -

    {{ _("Debit") }}

    +

    {{ _("Debit")|force_escape }}

      {% for record in item.debit_records %} @@ -79,7 +79,7 @@ First written: 2020/7/23
    • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ item.debit_total }}
      {% if should_validate %}{{ item.balance_error|default:"" }}{% endif %}
      @@ -88,7 +88,7 @@ First written: 2020/7/23
    -

    {{ _("Credit") }}

    +

    {{ _("Credit")|force_escape }}

      {% for record in item.credit_records %} @@ -105,7 +105,7 @@ First written: 2020/7/23
    • - {{ _("Total") }} + {{ _("Total")|force_escape }} {{ item.credit_total }}
      {% if should_validate %}{{ item.balance_error|default:"" }}{% endif %}
      @@ -116,7 +116,7 @@ First written: 2020/7/23
      - +
      @@ -128,7 +128,7 @@ First written: 2020/7/23
      diff --git a/accounting/templates/accounting/transactions/transfer/view.html b/accounting/templates/accounting/transactions/transfer/view.html index 0e7e731..d31045c 100644 --- a/accounting/templates/accounting/transactions/transfer/view.html +++ b/accounting/templates/accounting/transactions/transfer/view.html @@ -35,7 +35,7 @@ First written: 2020/7/23 {% if item.has_order_hole %}
      - {{ _("Error:") }} {{ _("The transactions on this day are not well-ordered. Please reorder them.") }} + {{ _("Error:") }} {{ _("The transactions on this day are not well-ordered. Please reorder them.")|force_escape }}
      {% endif %} @@ -49,17 +49,17 @@ First written: 2020/7/23 - +
    @@ -76,7 +76,7 @@ First written: 2020/7/23 {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} {% if not item.has_many_same_day %} - @@ -92,7 +92,7 @@ First written: 2020/7/23
    -
    {{ _("Date:") }}
    +
    {{ _("Date:")|force_escape }}
    {{ item.date|smart_date }}
    -

    {{ _("Debit") }}

    +

    {{ _("Debit")|force_escape }}

    {{ _("Account") }}{{ _("Summary") }}{{ _("$") }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("$")|force_escape }}
    {{ _("Total") }}{{ _("Total")|force_escape }} {{ item.credit_total|accounting_amount }}
    {{ _("Type") }}{{ _("Content") }}{{ _("Amount") }}{{ _("Notes") }}{{ _("Type")|force_escape }}{{ _("Content")|force_escape }}{{ _("Amount")|force_escape }}{{ _("Notes")|force_escape }}
    {% if item.is_cash_expense %} - {{ _("Cash Expense") }} + {{ _("Cash Expense")|force_escape }} {% elif item.is_cash_income %} - {{ _("Cash Income") }} + {{ _("Cash Income")|force_escape }} {% else %} - {{ _("Transfer") }} + {{ _("Transfer")|force_escape }} {% endif %} @@ -117,7 +117,7 @@ First written: 2020/8/6 {% endif %} {% if not item.is_balanced %} - {{ _("Unbalanced") }} + {{ _("Unbalanced")|force_escape }} {% endif %}
    - - - + + + @@ -138,7 +138,7 @@ First written: 2020/7/23 - + @@ -156,7 +156,7 @@ First written: 2020/7/23 {% endfor %}
  • @@ -164,14 +164,14 @@ First written: 2020/7/23
    -

    {{ _("Credit") }}

    +

    {{ _("Credit")|force_escape }}

    {{ _("Account") }}{{ _("Summary") }}{{ _("$") }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("$")|force_escape }}
    {{ _("Total") }}{{ _("Total")|force_escape }} {{ item.debit_total|accounting_amount }}
    - - - + + + @@ -185,7 +185,7 @@ First written: 2020/7/23 - + @@ -204,7 +204,7 @@ First written: 2020/7/23 {% endfor %}
  • @@ -214,28 +214,28 @@ First written: 2020/7/23 {% if item.notes %}
    -
    {{ _("Notes:") }}
    +
    {{ _("Notes:")|force_escape }}
    {{ item.notes }}
    {% endif %}
    -
    {{ _("Created at:") }}
    +
    {{ _("Created at:")|force_escape }}
    {{ item.created_at }}
    -
    {{ _("Created by:") }}
    +
    {{ _("Created by:")|force_escape }}
    {{ item.created_by.name }}
    -
    {{ _("Updated at:") }}
    +
    {{ _("Updated at:")|force_escape }}
    {{ item.updated_at }}
    -
    {{ _("Updated by:") }}
    +
    {{ _("Updated by:")|force_escape }}
    {{ item.updated_by.name }}
    diff --git a/accounting/templates/accounting/trial-balance.html b/accounting/templates/accounting/trial-balance.html index 4083fc8..21b371a 100644 --- a/accounting/templates/accounting/trial-balance.html +++ b/accounting/templates/accounting/trial-balance.html @@ -79,10 +79,10 @@ First written: 2020/7/19
    {{ _("Account") }}{{ _("Summary") }}{{ _("$") }}{{ _("Account")|force_escape }}{{ _("Summary")|force_escape }}{{ _("$")|force_escape }}
    {{ _("Total") }}{{ _("Total")|force_escape }} {{ item.credit_total|accounting_amount }}
    - - - - + + + + @@ -94,7 +94,7 @@ First written: 2020/7/19 @@ -102,7 +102,7 @@ First written: 2020/7/19 - + @@ -142,7 +142,7 @@ First written: 2020/7/19 {% endfor %}
  • - {{ _("Total") }} + {{ _("Total")|force_escape }}
    {{ total_item.debit_amount|intcomma:False }} diff --git a/mia_core/templates/mia_core/include/period-chooser.html b/mia_core/templates/mia_core/include/period-chooser.html index 2515011..782dcc7 100644 --- a/mia_core/templates/mia_core/include/period-chooser.html +++ b/mia_core/templates/mia_core/include/period-chooser.html @@ -105,7 +105,7 @@ First written: 2020/7/10
    - +
    {% endif %} @@ -123,7 +123,7 @@ First written: 2020/7/10
    - +
    {% endif %}
  • {{ _("Account") }}{{ _("Debit") }}{{ _("Credit") }}{{ _("View") }}{{ _("Account")|force_escape }}{{ _("Debit")|force_escape }}{{ _("Credit")|force_escape }}{{ _("View")|force_escape }}
    - {{ _("View") }} + {{ _("View")|force_escape }}
    {{ _("Total") }}{{ _("Total")|force_escape }} {{ total_item.debit_amount|accounting_amount }} {{ total_item.credit_amount|accounting_amount }}