diff --git a/src/accounting/templates/accounting/report/balance-sheet.html b/src/accounting/templates/accounting/report/balance-sheet.html index 9fa2598..05769ac 100644 --- a/src/accounting/templates/accounting/report/balance-sheet.html +++ b/src/accounting/templates/accounting/report/balance-sheet.html @@ -55,15 +55,15 @@ First written: 2023/3/7 -
+
{% if report.assets.subsections %} {% with section = report.assets %} {% include "accounting/report/include/balance-sheet-section.html" %} {% endwith %} -
-
{{ A_("Total") }}
-
{{ report.assets.total|accounting_report_format_amount }}
+
+
{{ A_("Total") }}
+
{{ report.assets.total|accounting_report_format_amount }}
{% endif %}
@@ -73,9 +73,9 @@ First written: 2023/3/7 {% with section = report.liabilities %} {% include "accounting/report/include/balance-sheet-section.html" %} {% endwith %} -
-
{{ A_("Total") }}
-
{{ report.liabilities.total|accounting_report_format_amount }}
+
+
{{ A_("Total") }}
+
{{ report.liabilities.total|accounting_report_format_amount }}
{% endif %} @@ -83,15 +83,15 @@ First written: 2023/3/7 {% with section = report.owner_s_equity %} {% include "accounting/report/include/balance-sheet-section.html" %} {% endwith %} -
-
{{ A_("Total") }}
-
{{ report.owner_s_equity.total|accounting_report_format_amount }}
+
+
{{ A_("Total") }}
+
{{ report.owner_s_equity.total|accounting_report_format_amount }}
{% endif %} -
-
{{ A_("Total") }}
-
{{ (report.liabilities.total + report.owner_s_equity.total)|accounting_report_format_amount }}
+
+
{{ A_("Total") }}
+
{{ (report.liabilities.total + report.owner_s_equity.total)|accounting_report_format_amount }}
diff --git a/src/accounting/templates/accounting/report/include/balance-sheet-section.html b/src/accounting/templates/accounting/report/include/balance-sheet-section.html index a013aeb..f3f50c8 100644 --- a/src/accounting/templates/accounting/report/include/balance-sheet-section.html +++ b/src/accounting/templates/accounting/report/include/balance-sheet-section.html @@ -19,24 +19,24 @@ balance-sheet-section.html: A section in the balance sheet. Author: imacat@mail.imacat.idv.tw (imacat) First written: 2023/3/8 #} -
-
{{ section.title.title }}
+
+
{{ section.title.title }}
{% for subsection in section.subsections %} -
-
+
+
{{ subsection.title.code }} {{ subsection.title.title }}
{% for account in subsection.accounts %} -
{% endfor %} {% endfor %} diff --git a/src/accounting/templates/accounting/report/include/income-expenses-row-desktop.html b/src/accounting/templates/accounting/report/include/income-expenses-row-desktop.html index 870ad2b..9e431ea 100644 --- a/src/accounting/templates/accounting/report/include/income-expenses-row-desktop.html +++ b/src/accounting/templates/accounting/report/include/income-expenses-row-desktop.html @@ -19,9 +19,9 @@ income-expenses-row-desktop.html: The row in the income and expenses log for the Author: imacat@mail.imacat.idv.tw (imacat) First written: 2023/3/8 #} -
{{ line_item.date|accounting_format_date }}
-
{{ line_item.account.title }}
-
{{ line_item.description|accounting_default }}
-
{{ line_item.income|accounting_format_amount|accounting_default }}
-
{{ line_item.expense|accounting_format_amount|accounting_default }}
-
{{ line_item.balance|accounting_report_format_amount }}
+
{{ line_item.date|accounting_format_date }}
+
{{ line_item.account.title }}
+
{{ line_item.description|accounting_default }}
+
{{ line_item.income|accounting_format_amount|accounting_default }}
+
{{ line_item.expense|accounting_format_amount|accounting_default }}
+
{{ line_item.balance|accounting_report_format_amount }}
diff --git a/src/accounting/templates/accounting/report/include/ledger-row-desktop.html b/src/accounting/templates/accounting/report/include/ledger-row-desktop.html index 428b289..d25db27 100644 --- a/src/accounting/templates/accounting/report/include/ledger-row-desktop.html +++ b/src/accounting/templates/accounting/report/include/ledger-row-desktop.html @@ -19,10 +19,10 @@ ledger-row-desktop.html: The row in the ledger for the desktop computers Author: imacat@mail.imacat.idv.tw (imacat) First written: 2023/3/8 #} -
{{ line_item.date|accounting_format_date }}
-
{{ line_item.description|accounting_default }}
-
{{ line_item.debit|accounting_format_amount|accounting_default }}
-
{{ line_item.credit|accounting_format_amount|accounting_default }}
+
{{ line_item.date|accounting_format_date }}
+
{{ line_item.description|accounting_default }}
+
{{ line_item.debit|accounting_format_amount|accounting_default }}
+
{{ line_item.credit|accounting_format_amount|accounting_default }}
{% if report.account.is_real %} -
{{ line_item.balance|accounting_report_format_amount }}
+
{{ line_item.balance|accounting_report_format_amount }}
{% endif %} diff --git a/src/accounting/templates/accounting/report/income-expenses.html b/src/accounting/templates/accounting/report/income-expenses.html index d768004..311fbd5 100644 --- a/src/accounting/templates/accounting/report/income-expenses.html +++ b/src/accounting/templates/accounting/report/income-expenses.html @@ -49,27 +49,27 @@ First written: 2023/3/5 {% include "accounting/include/pagination.html" %} {% endwith %} -
+
-
-
{{ A_("Date") }}
-
{{ A_("Account") }}
-
{{ A_("Description") }}
-
{{ A_("Income") }}
-
{{ A_("Expense") }}
-
{{ A_("Balance") }}
+
+
{{ A_("Date") }}
+
{{ A_("Account") }}
+
{{ A_("Description") }}
+
{{ A_("Income") }}
+
{{ A_("Expense") }}
+
{{ A_("Balance") }}
{% if report.brought_forward %} {% with line_item = report.brought_forward %} -
+
{% include "accounting/report/include/income-expenses-row-desktop.html" %}
{% endwith %} {% endif %} {% for line_item in report.line_items %} - + {% include "accounting/report/include/income-expenses-row-desktop.html" %} {% endfor %} @@ -77,11 +77,11 @@ First written: 2023/3/5 {% if report.total %} {% with line_item = report.total %} -
+
-
-
{{ A_("Amount") }}
+
+
{{ A_("Amount") }}
{% for section in report.sections %} -
-
+
+
{{ section.title.code }} {{ section.title.title }}
{% for subsection in section.subsections %} -
-
+
+
{{ subsection.title.code }} {{ subsection.title.title }}
{% for account in subsection.accounts %} -
{% endfor %} -
-
{{ A_("Total") }}
-
{{ subsection.total|accounting_report_format_amount }}
+
+
{{ A_("Total") }}
+
{{ subsection.total|accounting_report_format_amount }}
{% endfor %} -
-
{{ section.accumulated.title }}
-
{{ section.accumulated.amount|accounting_report_format_amount }}
+
+
{{ section.accumulated.title }}
+
{{ section.accumulated.amount|accounting_report_format_amount }}
{% endfor %}
diff --git a/src/accounting/templates/accounting/report/journal.html b/src/accounting/templates/accounting/report/journal.html index 4e61108..911a6e6 100644 --- a/src/accounting/templates/accounting/report/journal.html +++ b/src/accounting/templates/accounting/report/journal.html @@ -47,29 +47,29 @@ First written: 2023/3/4 {% include "accounting/include/pagination.html" %} {% endwith %} -
+
-
-
{{ A_("Date") }}
-
{{ A_("Currency") }}
-
{{ A_("Account") }}
-
{{ A_("Description") }}
-
{{ A_("Debit") }}
-
{{ A_("Credit") }}
+
+
{{ A_("Date") }}
+
{{ A_("Currency") }}
+
{{ A_("Account") }}
+
{{ A_("Description") }}
+
{{ A_("Debit") }}
+
{{ A_("Credit") }}
{% for line_item in report.line_items %} - -
{{ line_item.journal_entry.date|accounting_format_date }}
-
{{ line_item.currency.name }}
-
diff --git a/src/accounting/templates/accounting/report/ledger.html b/src/accounting/templates/accounting/report/ledger.html index 2b033ac..cc71e8f 100644 --- a/src/accounting/templates/accounting/report/ledger.html +++ b/src/accounting/templates/accounting/report/ledger.html @@ -49,28 +49,28 @@ First written: 2023/3/5 {% include "accounting/include/pagination.html" %} {% endwith %} -
+
-
{{ A_("Date") }}
-
{{ A_("Description") }}
-
{{ A_("Debit") }}
-
{{ A_("Credit") }}
+
{{ A_("Date") }}
+
{{ A_("Description") }}
+
{{ A_("Debit") }}
+
{{ A_("Credit") }}
{% if report.account.is_real %} -
{{ A_("Balance") }}
+
{{ A_("Balance") }}
{% endif %}
{% if report.brought_forward %} {% with line_item = report.brought_forward %} -
+
{% include "accounting/report/include/ledger-row-desktop.html" %}
{% endwith %} {% endif %} {% for line_item in report.line_items %} - + {% include "accounting/report/include/ledger-row-desktop.html" %} {% endfor %} @@ -78,12 +78,12 @@ First written: 2023/3/5 {% if report.total %} {% with line_item = report.total %}