Replaced the "current_accounts" function with the "accounts" class method of the CurrentAccount data model.
This commit is contained in:
parent
7755365467
commit
7e90ec5a8f
@ -27,7 +27,7 @@ from accounting.forms import CurrencyExists, AccountExists, IsDebitAccount, \
|
|||||||
IsCreditAccount
|
IsCreditAccount
|
||||||
from accounting.locale import lazy_gettext
|
from accounting.locale import lazy_gettext
|
||||||
from accounting.models import Account
|
from accounting.models import Account
|
||||||
from accounting.utils.current_account import CurrentAccount, current_accounts
|
from accounting.utils.current_account import CurrentAccount
|
||||||
from accounting.utils.options import Options
|
from accounting.utils.options import Options
|
||||||
from accounting.utils.strip_text import strip_text
|
from accounting.utils.strip_text import strip_text
|
||||||
|
|
||||||
@ -240,4 +240,4 @@ class OptionForm(FlaskForm):
|
|||||||
|
|
||||||
:return: The current accounts.
|
:return: The current accounts.
|
||||||
"""
|
"""
|
||||||
return current_accounts()
|
return CurrentAccount.accounts()
|
||||||
|
@ -66,14 +66,13 @@ class CurrentAccount:
|
|||||||
account.str = account.title
|
account.str = account.title
|
||||||
return account
|
return account
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def accounts(cls) -> list[t.Self]:
|
||||||
|
"""Returns the current assets and liabilities accounts.
|
||||||
|
|
||||||
def current_accounts() -> list[CurrentAccount]:
|
:return: The current assets and liabilities accounts.
|
||||||
"""Returns accounts for the income and expenses log.
|
|
||||||
|
|
||||||
:return: The accounts for the income and expenses log.
|
|
||||||
"""
|
"""
|
||||||
accounts: list[CurrentAccount] \
|
accounts: list[cls] = [cls.current_assets_and_liabilities()]
|
||||||
= [CurrentAccount.current_assets_and_liabilities()]
|
|
||||||
accounts.extend([CurrentAccount(x)
|
accounts.extend([CurrentAccount(x)
|
||||||
for x in db.session.query(Account)
|
for x in db.session.query(Account)
|
||||||
.filter(sa.or_(Account.base_code.startswith("11"),
|
.filter(sa.or_(Account.base_code.startswith("11"),
|
||||||
|
Loading…
Reference in New Issue
Block a user