diff --git a/src/accounting/report/converters.py b/src/accounting/report/converters.py index f1ecac2..9fa5dfb 100644 --- a/src/accounting/report/converters.py +++ b/src/accounting/report/converters.py @@ -52,8 +52,8 @@ class PeriodConverter(BaseConverter): class IncomeExpensesAccountConverter(BaseConverter): - """The supplier converter to convert the income and expenses pseudo account - code from and to the corresponding pseudo account in the routes.""" + """The supplier converter to convert the income and expenses log pseudo + account code from and to the corresponding pseudo account in the routes.""" def to_python(self, value: str) -> IncomeExpensesAccount: """Converts an account code to an account. diff --git a/src/accounting/report/reports/income_expenses.py b/src/accounting/report/reports/income_expenses.py index cf3786e..9dd19c3 100644 --- a/src/accounting/report/reports/income_expenses.py +++ b/src/accounting/report/reports/income_expenses.py @@ -367,9 +367,9 @@ class IncomeExpensesPageParams(PageParams): def _populate_entries(entries: list[Entry]) -> None: - """Populates the income and expenses entries with relative data. + """Populates the income and expenses log entries with relative data. - :param entries: The income and expenses entries. + :param entries: The income and expenses log entries. :return: None. """ transactions: dict[int, Transaction] \ diff --git a/src/accounting/report/reports/utils/period_choosers.py b/src/accounting/report/reports/utils/period_choosers.py index 759274e..54625e5 100644 --- a/src/accounting/report/reports/utils/period_choosers.py +++ b/src/accounting/report/reports/utils/period_choosers.py @@ -142,10 +142,10 @@ class LedgerPeriodChooser(PeriodChooser): class IncomeExpensesPeriodChooser(PeriodChooser): - """The income and expenses period chooser.""" + """The income and expenses log period chooser.""" def __init__(self, currency: Currency, account: IncomeExpensesAccount): - """Constructs the income and expenses period chooser.""" + """Constructs the income and expenses log period chooser.""" self.currency: Currency = currency """The currency.""" self.account: IncomeExpensesAccount = account diff --git a/src/accounting/report/reports/utils/report_chooser.py b/src/accounting/report/reports/utils/report_chooser.py index 6609dd1..7998014 100644 --- a/src/accounting/report/reports/utils/report_chooser.py +++ b/src/accounting/report/reports/utils/report_chooser.py @@ -104,9 +104,9 @@ class ReportChooser: @property def __income_expenses(self) -> OptionLink: - """Returns the income and expenses. + """Returns the income and expenses log. - :return: The income and expenses. + :return: The income and expenses log. """ account: Account = self.__account if not re.match(r"[12][12]", account.base_code): @@ -117,7 +117,7 @@ class ReportChooser: else url_for("accounting.report.income-expenses", currency=self.__currency, account=account, period=self.__period) - return OptionLink(gettext("Income and Expenses"), url, + return OptionLink(gettext("Income and Expenses Log"), url, self.__active_report == ReportType.INCOME_EXPENSES) @property diff --git a/src/accounting/report/reports/utils/report_type.py b/src/accounting/report/reports/utils/report_type.py index ff07f0c..c90218e 100644 --- a/src/accounting/report/reports/utils/report_type.py +++ b/src/accounting/report/reports/utils/report_type.py @@ -27,7 +27,7 @@ class ReportType(Enum): LEDGER: str = "ledger" """The ledger.""" INCOME_EXPENSES: str = "income-expenses" - """The income and expenses.""" + """The income and expenses log.""" TRIAL_BALANCE: str = "trial-balance" """The trial balance.""" INCOME_STATEMENT: str = "income-statement" diff --git a/src/accounting/report/views.py b/src/accounting/report/views.py index a3345e8..61723a3 100644 --- a/src/accounting/report/views.py +++ b/src/accounting/report/views.py @@ -115,11 +115,11 @@ def __get_ledger_list(currency: Currency, account: Account, period: Period) \ def get_default_income_expenses_list(currency: Currency, account: IncomeExpensesAccount) \ -> str | Response: - """Returns the income and expenses in the default period. + """Returns the income and expenses log in the default period. :param currency: The currency. :param account: The account. - :return: The income and expenses in the default period. + :return: The income and expenses log in the default period. """ return __get_income_expenses_list(currency, account, Period.get_instance()) @@ -131,12 +131,12 @@ def get_default_income_expenses_list(currency: Currency, def get_income_expenses_list(currency: Currency, account: IncomeExpensesAccount, period: Period) -> str | Response: - """Returns the income and expenses. + """Returns the income and expenses log. :param currency: The currency. :param account: The account. :param period: The period. - :return: The income and expenses in the period. + :return: The income and expenses log in the period. """ return __get_income_expenses_list(currency, account, period) @@ -144,12 +144,12 @@ def get_income_expenses_list(currency: Currency, def __get_income_expenses_list(currency: Currency, account: IncomeExpensesAccount, period: Period) -> str | Response: - """Returns the income and expenses. + """Returns the income and expenses log. :param currency: The currency. :param account: The account. :param period: The period. - :return: The income and expenses in the period. + :return: The income and expenses log in the period. """ report: IncomeExpenses = IncomeExpenses(currency, account, period) if "as" in request.args and request.args["as"] == "csv": 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 d339f1c..0cce495 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 @@ -1,6 +1,6 @@ {# The Mia! Accounting Flask Project -income-expenses-row-desktop.html: The row in the income and expenses for the desktop computers +income-expenses-row-desktop.html: The row in the income and expenses log for the desktop computers Copyright (c) 2023 imacat. diff --git a/src/accounting/templates/accounting/report/include/income-expenses-row-mobile.html b/src/accounting/templates/accounting/report/include/income-expenses-row-mobile.html index 2bf0716..9f91b53 100644 --- a/src/accounting/templates/accounting/report/include/income-expenses-row-mobile.html +++ b/src/accounting/templates/accounting/report/include/income-expenses-row-mobile.html @@ -1,6 +1,6 @@ {# The Mia! Accounting Flask Project -income-expenses-row-mobile.html: The row in the income and expenses for the mobile devices +income-expenses-row-mobile.html: The row in the income and expenses log for the mobile devices Copyright (c) 2023 imacat. diff --git a/src/accounting/templates/accounting/report/income-expenses.html b/src/accounting/templates/accounting/report/income-expenses.html index 95528ca..b70c96e 100644 --- a/src/accounting/templates/accounting/report/income-expenses.html +++ b/src/accounting/templates/accounting/report/income-expenses.html @@ -1,6 +1,6 @@ {# The Mia! Accounting Flask Project -income-expenses.html: The income and expenses +income-expenses.html: The income and expenses log Copyright (c) 2023 imacat. @@ -27,7 +27,7 @@ First written: 2023/3/5 {% endblock %} -{% block header %}{% block title %}{{ _("Income and Expenses of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account|title, period=report.period.desc|title) }}{% endblock %}{% endblock %} +{% block header %}{% block title %}{{ _("Income and Expenses Log of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account|title, period=report.period.desc|title) }}{% endblock %}{% endblock %} {% block content %}