Renamed IncomeExpensesAccount to CurrentAccount.

This commit is contained in:
2023-03-22 15:42:44 +08:00
parent 761d5a5824
commit 567004f7d9
9 changed files with 45 additions and 46 deletions

View File

@ -30,7 +30,7 @@ from accounting.locale import gettext
from accounting.models import Currency, Account
from accounting.report.period import Period, get_period
from accounting.template_globals import default_currency_code
from accounting.utils.ie_account import IncomeExpensesAccount
from accounting.utils.current_account import CurrentAccount
from .option_link import OptionLink
from .report_type import ReportType
from .urls import journal_url, ledger_url, income_expenses_url, \
@ -113,7 +113,7 @@ class ReportChooser:
account: Account = Account.cash()
return OptionLink(gettext("Income and Expenses Log"),
income_expenses_url(self.__currency,
IncomeExpensesAccount(account),
CurrentAccount(account),
self.__period),
self.__active_report == ReportType.INCOME_EXPENSES,
fa_icon="fa-solid fa-money-bill-wave")

View File

@ -23,7 +23,7 @@ from accounting.models import Currency, Account
from accounting.option.options import options
from accounting.report.period import Period
from accounting.template_globals import default_currency_code
from accounting.utils.ie_account import IncomeExpensesAccount
from accounting.utils.current_account import CurrentAccount
def journal_url(period: Period) \
@ -55,7 +55,7 @@ def ledger_url(currency: Currency, account: Account, period: Period) \
period=period)
def income_expenses_url(currency: Currency, account: IncomeExpensesAccount,
def income_expenses_url(currency: Currency, account: CurrentAccount,
period: Period) -> str:
"""Returns the URL of an income and expenses log.