From 0c35fa1196124a57028f05812b1915da53a68a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 12 Aug 2020 07:46:55 +0800 Subject: [PATCH] Renamed the templates of the accounting reports to group them together in the accounting application. --- ...ance-sheet.html => report-balance-sheet.html} | 0 ...ash-summary.html => report-cash-summary.html} | 0 .../accounting/{cash.html => report-cash.html} | 0 ...atement.html => report-income-statement.html} | 0 .../{journal.html => report-journal.html} | 0 ...r-summary.html => report-ledger-summary.html} | 0 .../{ledger.html => report-ledger.html} | 0 ...al-balance.html => report-trial-balance.html} | 0 accounting/views.py | 16 ++++++++-------- 9 files changed, 8 insertions(+), 8 deletions(-) rename accounting/templates/accounting/{balance-sheet.html => report-balance-sheet.html} (100%) rename accounting/templates/accounting/{cash-summary.html => report-cash-summary.html} (100%) rename accounting/templates/accounting/{cash.html => report-cash.html} (100%) rename accounting/templates/accounting/{income-statement.html => report-income-statement.html} (100%) rename accounting/templates/accounting/{journal.html => report-journal.html} (100%) rename accounting/templates/accounting/{ledger-summary.html => report-ledger-summary.html} (100%) rename accounting/templates/accounting/{ledger.html => report-ledger.html} (100%) rename accounting/templates/accounting/{trial-balance.html => report-trial-balance.html} (100%) diff --git a/accounting/templates/accounting/balance-sheet.html b/accounting/templates/accounting/report-balance-sheet.html similarity index 100% rename from accounting/templates/accounting/balance-sheet.html rename to accounting/templates/accounting/report-balance-sheet.html diff --git a/accounting/templates/accounting/cash-summary.html b/accounting/templates/accounting/report-cash-summary.html similarity index 100% rename from accounting/templates/accounting/cash-summary.html rename to accounting/templates/accounting/report-cash-summary.html diff --git a/accounting/templates/accounting/cash.html b/accounting/templates/accounting/report-cash.html similarity index 100% rename from accounting/templates/accounting/cash.html rename to accounting/templates/accounting/report-cash.html diff --git a/accounting/templates/accounting/income-statement.html b/accounting/templates/accounting/report-income-statement.html similarity index 100% rename from accounting/templates/accounting/income-statement.html rename to accounting/templates/accounting/report-income-statement.html diff --git a/accounting/templates/accounting/journal.html b/accounting/templates/accounting/report-journal.html similarity index 100% rename from accounting/templates/accounting/journal.html rename to accounting/templates/accounting/report-journal.html diff --git a/accounting/templates/accounting/ledger-summary.html b/accounting/templates/accounting/report-ledger-summary.html similarity index 100% rename from accounting/templates/accounting/ledger-summary.html rename to accounting/templates/accounting/report-ledger-summary.html diff --git a/accounting/templates/accounting/ledger.html b/accounting/templates/accounting/report-ledger.html similarity index 100% rename from accounting/templates/accounting/ledger.html rename to accounting/templates/accounting/report-ledger.html diff --git a/accounting/templates/accounting/trial-balance.html b/accounting/templates/accounting/report-trial-balance.html similarity index 100% rename from accounting/templates/accounting/trial-balance.html rename to accounting/templates/accounting/report-trial-balance.html diff --git a/accounting/views.py b/accounting/views.py index a5c3f98..9536b30 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -162,7 +162,7 @@ def cash(request, account, period): find_order_holes(records) accounts = get_cash_accounts() shortcut_accounts = get_cash_shortcut_accounts() - return render(request, "accounting/cash.html", { + return render(request, "accounting/report-cash.html", { "record_list": records, "pagination": pagination, "shortcut_accounts": [x for x in accounts @@ -259,7 +259,7 @@ def cash_summary(request, account): except PaginationException as e: return redirect(e.url) shortcut_accounts = get_cash_shortcut_accounts() - return render(request, "accounting/cash-summary.html", { + return render(request, "accounting/report-cash-summary.html", { "month_list": pagination.items, "pagination": pagination, "shortcut_accounts": [x for x in accounts if @@ -339,7 +339,7 @@ def ledger(request, account, period): find_order_holes(records) find_payable_records(account, records) find_existing_equipments(account, records) - return render(request, "accounting/ledger.html", { + return render(request, "accounting/report-ledger.html", { "record_list": records, "pagination": pagination, "accounts": get_ledger_accounts(), @@ -401,7 +401,7 @@ def ledger_summary(request, account): pagination = Pagination(request, months, True) except PaginationException as e: return redirect(e.url) - return render(request, "accounting/ledger-summary.html", { + return render(request, "accounting/report-ledger-summary.html", { "month_list": pagination.items, "pagination": pagination, "accounts": get_ledger_accounts(), @@ -484,7 +484,7 @@ def journal(request, period): pagination = Pagination(request, records, True) except PaginationException as e: return redirect(e.url) - return render(request, "accounting/journal.html", { + return render(request, "accounting/report-journal.html", { "record_list": pagination.items, "pagination": pagination, }) @@ -587,7 +587,7 @@ def trial_balance(request, period): if x.debit_amount is not None]) total_account.credit_amount = sum([x.credit_amount for x in accounts if x.credit_amount is not None]) - return render(request, "accounting/trial-balance.html", { + return render(request, "accounting/report-trial-balance.html", { "account_list": accounts, "total_item": total_account, }) @@ -663,7 +663,7 @@ def income_statement(request, period): section.cumulative_total = None section.has_next = True sections[-1].has_next = False - return render(request, "accounting/income-statement.html", { + return render(request, "accounting/report-income-statement.html", { "section_list": sections, }) @@ -761,7 +761,7 @@ def balance_sheet(request, period): for x in group.details]) section.amount = sum([x.amount for x in section.groups]) by_code = {x.code: x for x in sections} - return render(request, "accounting/balance-sheet.html", { + return render(request, "accounting/report-balance-sheet.html", { "assets": by_code["1"], "liabilities": by_code["2"], "owners_equity": by_code["3"],