Moved the "accounting.option.options" module to "accounting.utils.options", because it is meant to shared by other submodules.

This commit is contained in:
依瑪貓 2023-03-22 19:47:24 +08:00
parent e2a4340f2a
commit c885c08c37
7 changed files with 6 additions and 7 deletions

View File

@ -21,11 +21,10 @@ import re
import typing as t import typing as t
import sqlalchemy as sa import sqlalchemy as sa
from flask import current_app
from accounting import db from accounting import db
from accounting.models import Account, JournalEntryLineItem from accounting.models import Account, JournalEntryLineItem
from accounting.option.options import options, Recurring from accounting.utils.options import options, Recurring
class DescriptionAccount: class DescriptionAccount:

View File

@ -29,8 +29,8 @@ from accounting.forms import CurrencyExists
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, current_accounts
from accounting.utils.options import Options
from accounting.utils.strip_text import strip_text from accounting.utils.strip_text import strip_text
from .options import Options
class AccountExists: class AccountExists:

View File

@ -27,9 +27,9 @@ from accounting.locale import lazy_gettext
from accounting.utils.cast import s from accounting.utils.cast import s
from accounting.utils.flash_errors import flash_form_errors from accounting.utils.flash_errors import flash_form_errors
from accounting.utils.next_uri import inherit_next from accounting.utils.next_uri import inherit_next
from accounting.utils.options import options
from accounting.utils.permission import has_permission, can_admin from accounting.utils.permission import has_permission, can_admin
from .forms import OptionForm from .forms import OptionForm
from .options import options
bp: Blueprint = Blueprint("option", __name__) bp: Blueprint = Blueprint("option", __name__)
"""The view blueprint for the currency management.""" """The view blueprint for the currency management."""

View File

@ -20,10 +20,10 @@
from flask import url_for from flask import url_for
from accounting.models import Currency, Account from accounting.models import Currency, Account
from accounting.option.options import options
from accounting.report.period import Period from accounting.report.period import Period
from accounting.template_globals import default_currency_code from accounting.template_globals import default_currency_code
from accounting.utils.current_account import CurrentAccount from accounting.utils.current_account import CurrentAccount
from accounting.utils.options import options
def journal_url(period: Period) \ def journal_url(period: Period) \

View File

@ -21,10 +21,10 @@ from flask import Blueprint, request, Response
from accounting import db from accounting import db
from accounting.models import Currency, Account from accounting.models import Currency, Account
from accounting.option.options import options
from accounting.report.period import Period, get_period from accounting.report.period import Period, get_period
from accounting.template_globals import default_currency_code from accounting.template_globals import default_currency_code
from accounting.utils.current_account import CurrentAccount from accounting.utils.current_account import CurrentAccount
from accounting.utils.options import options
from accounting.utils.permission import has_permission, can_view from accounting.utils.permission import has_permission, can_view
from .reports import Journal, Ledger, IncomeExpenses, TrialBalance, \ from .reports import Journal, Ledger, IncomeExpenses, TrialBalance, \
IncomeStatement, BalanceSheet, Search IncomeStatement, BalanceSheet, Search

View File

@ -18,7 +18,7 @@
""" """
from accounting.models import Currency from accounting.models import Currency
from accounting.option.options import options from accounting.utils.options import options
def currency_options() -> str: def currency_options() -> str: