Advanced to version 1.5.1.

"user_pk" type aliases for the columns in the data models.  They do not work with the current version of Flask-SQLAlchemy when creating Sphinx documentation.

docs/source/changelog.rst

@@ -1,5 +1,15 @@
-Changes
-=======
+Change Log
+==========
+
+
+Version 1.5.1
+-------------
+
+Released 2023/4/30
+
+* Fixed the error calling the old ``setEnableDescriptionAccount``
+  method in the ``saveOriginalLineItem`` method of the JavaScript
+  ``JournalEntryLineItemEditor`` class.
 
 
 Version 1.5.0

src/accounting/__init__.py

@@ -24,7 +24,7 @@ from flask_sqlalchemy import SQLAlchemy
 
 from accounting.utils.user import UserUtilityInterface
 
-VERSION: str = "1.5.0"
+VERSION: str = "1.5.1"
 """The package version."""
 db: SQLAlchemy = SQLAlchemy()
 """The database instance."""

src/accounting/account/commands.py

@@ -17,15 +17,15 @@
 """The console commands for the account management.
 
 """
-import typing as t
 from secrets import randbelow
+from typing import Any
 
 import click
+import sqlalchemy as sa
 
 from accounting import db
 from accounting.models import BaseAccount, Account, AccountL10n
 from accounting.utils.user import get_user_pk
-import sqlalchemy as sa
 
 AccountData = tuple[int, str, int, str, str, str, bool]
 """The format of the account data, as a list of (ID, base account code, number,
@@ -63,8 +63,8 @@ def init_accounts_command(username: str) -> None:
                 existing_id.add(new_id)
                 return new_id
 
-    data: list[dict[str, t.Any]] = []
-    l10n_data: list[dict[str, t.Any]] = []
+    data: list[dict[str, Any]] = []
+    l10n_data: list[dict[str, Any]] = []
     for base in bases_to_add:
         l10n: dict[str, str] = {x.locale: x.title for x in base.l10n}
         account_id: int = get_new_id()

src/accounting/currency/commands.py

@@ -18,7 +18,7 @@
 
 """
 import csv
-import typing as t
+from typing import Any
 
 import sqlalchemy as sa
 
@@ -39,7 +39,7 @@ def init_currencies_command(username: str) -> None:
         return
 
     creator_pk: int = get_user_pk(username)
-    currency_data: list[dict[str, t.Any]] = [{"code": x["code"],
+    currency_data: list[dict[str, Any]] = [{"code": x["code"],
                                             "name_l10n": x["name"],
                                             "created_by_id": creator_pk,
                                             "updated_by_id": creator_pk}

src/accounting/journal_entry/converters.py

@@ -17,7 +17,7 @@
 """The path converters for the journal entry management.
 
 """
-from datetime import date
+import datetime as dt
 
 from flask import abort
 from werkzeug.routing import BaseConverter
@@ -82,18 +82,18 @@ class DateConverter(BaseConverter):
     """The date converter to convert the ISO date from and to the
     corresponding date in the routes."""
 
-    def to_python(self, value: str) -> date:
+    def to_python(self, value: str) -> dt.date:
         """Converts an ISO date to a date.
 
         :param value: The ISO date.
         :return: The corresponding date.
         """
         try:
-            return date.fromisoformat(value)
+            return dt.date.fromisoformat(value)
         except ValueError:
             abort(404)
 
-    def to_url(self, value: date) -> str:
+    def to_url(self, value: dt.date) -> str:
         """Converts a date to its ISO date.
 
         :param value: The date.

src/accounting/journal_entry/forms/journal_entry.py

@@ -18,8 +18,8 @@
 
 """
 import datetime as dt
-import typing as t
 from abc import ABC, abstractmethod
+from typing import TypeVar, Generic, Type
 
 import sqlalchemy as sa
 from flask_babel import LazyString
@@ -29,13 +29,13 @@ from wtforms import DateField, FieldList, FormField, TextAreaField, \
 from wtforms.validators import DataRequired, ValidationError
 
 from accounting import db
+from accounting.journal_entry.utils.account_option import AccountOption
+from accounting.journal_entry.utils.description_editor import DescriptionEditor
+from accounting.journal_entry.utils.original_line_items import \
+    get_selectable_original_line_items
 from accounting.locale import lazy_gettext
 from accounting.models import JournalEntry, Account, JournalEntryLineItem, \
     JournalEntryCurrency
-from accounting.journal_entry.utils.account_option import AccountOption
-from accounting.journal_entry.utils.original_line_items import \
-    get_selectable_original_line_items
-from accounting.journal_entry.utils.description_editor import DescriptionEditor
 from accounting.utils.random_id import new_id
 from accounting.utils.strip_text import strip_multiline_text
 from accounting.utils.user import get_current_user_pk
@@ -123,7 +123,7 @@ class JournalEntryForm(FlaskForm):
         super().__init__(*args, **kwargs)
         self.is_modified: bool = False
         """Whether the journal entry is modified during populate_obj()."""
-        self.collector: t.Type[LineItemCollector] = LineItemCollector
+        self.collector: Type[LineItemCollector] = LineItemCollector
         """The line item collector.  The default is the base abstract
         collector only to provide the correct type.  The subclass forms should
         provide their own collectors."""
@@ -155,7 +155,7 @@ class JournalEntryForm(FlaskForm):
         self.__set_date(obj, self.date.data)
         obj.note = self.note.data
 
-        collector_cls: t.Type[LineItemCollector] = self.collector
+        collector_cls: Type[LineItemCollector] = self.collector
         collector: collector_cls = collector_cls(self, obj)
         collector.collect()
 
@@ -309,11 +309,11 @@ class JournalEntryForm(FlaskForm):
         return db.session.scalar(select)
 
 
-T = t.TypeVar("T", bound=JournalEntryForm)
+T = TypeVar("T", bound=JournalEntryForm)
 """A journal entry form variant."""
 
 
-class LineItemCollector(t.Generic[T], ABC):
+class LineItemCollector(Generic[T], ABC):
     """The line item collector."""
 
     def __init__(self, form: T, obj: JournalEntry):

src/accounting/journal_entry/forms/line_item.py

@@ -17,7 +17,7 @@
 """The line item sub-forms for the journal entry management.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -307,7 +307,7 @@ class LineItemForm(FlaskForm):
         return getattr(self, "____original_line_item")
 
     @property
-    def original_line_item_date(self) -> date | None:
+    def original_line_item_date(self) -> dt.date | None:
         """Returns the text representation of the original line item.
 
         :return: The text representation of the original line item.

src/accounting/journal_entry/forms/reorder.py

@@ -17,7 +17,7 @@
 """The reorder forms for the journal entry management.
 
 """
-from datetime import date
+import datetime as dt
 
 import sqlalchemy as sa
 from flask import request
@@ -26,17 +26,15 @@ from accounting import db
 from accounting.models import JournalEntry
 
 
-def sort_journal_entries_in(journal_entry_date: date,
-                            exclude: int | None = None) -> None:
+def sort_journal_entries_in(date: dt.date, exclude: int | None = None) -> None:
     """Sorts the journal entries under a date after changing the date or
     deleting a journal entry.
 
-    :param journal_entry_date: The date of the journal entry.
+    :param date: The date of the journal entry.
     :param exclude: The journal entry ID to exclude.
     :return: None.
     """
-    conditions: list[sa.BinaryExpression] \
-        = [JournalEntry.date == journal_entry_date]
+    conditions: list[sa.BinaryExpression] = [JournalEntry.date == date]
     if exclude is not None:
         conditions.append(JournalEntry.id != exclude)
     journal_entries: list[JournalEntry] = JournalEntry.query\
@@ -50,12 +48,12 @@ def sort_journal_entries_in(journal_entry_date: date,
 class JournalEntryReorderForm:
     """The form to reorder the journal entries."""
 
-    def __init__(self, journal_entry_date: date):
+    def __init__(self, date: dt.date):
         """Constructs the form to reorder the journal entries in a day.
 
-        :param journal_entry_date: The date.
+        :param date: The date.
         """
-        self.date: date = journal_entry_date
+        self.date: dt.date = date
         self.is_modified: bool = False
 
     def save_order(self) -> None:

src/accounting/journal_entry/utils/description_editor.py

@@ -18,7 +18,7 @@
 
 """
 import re
-import typing as t
+from typing import Literal
 
 import sqlalchemy as sa
 
@@ -124,12 +124,12 @@ class DescriptionTag:
 class DescriptionType:
     """A description type"""
 
-    def __init__(self, type_id: t.Literal["general", "travel", "bus"]):
+    def __init__(self, type_id: Literal["general", "travel", "bus"]):
         """Constructs a description type.
 
         :param type_id: The type ID, either "general", "travel", or "bus".
         """
-        self.id: t.Literal["general", "travel", "bus"] = type_id
+        self.id: Literal["general", "travel", "bus"] = type_id
         """The type ID."""
         self.__tag_dict: dict[str, DescriptionTag] = {}
         """A dictionary from the tag name to their corresponding tag."""
@@ -181,12 +181,12 @@ class DescriptionRecurring:
 class DescriptionDebitCredit:
     """The description on debit or credit."""
 
-    def __init__(self, debit_credit: t.Literal["debit", "credit"]):
+    def __init__(self, debit_credit: Literal["debit", "credit"]):
         """Constructs the description on debit or credit.
 
         :param debit_credit: Either "debit" or "credit".
         """
-        self.debit_credit: t.Literal["debit", "credit"] = debit_credit
+        self.debit_credit: Literal["debit", "credit"] = debit_credit
         """Either debit or credit."""
         self.general: DescriptionType = DescriptionType("general")
         """The general tags."""
@@ -194,14 +194,14 @@ class DescriptionDebitCredit:
         """The travel tags."""
         self.bus: DescriptionType = DescriptionType("bus")
         """The bus tags."""
-        self.__type_dict: dict[t.Literal["general", "travel", "bus"],
+        self.__type_dict: dict[Literal["general", "travel", "bus"],
                                DescriptionType] \
             = {x.id: x for x in {self.general, self.travel, self.bus}}
         """A dictionary from the type ID to the corresponding tags."""
         self.recurring: list[DescriptionRecurring] = []
         """The recurring transactions."""
 
-    def add_tag(self, tag_type: t.Literal["general", "travel", "bus"],
+    def add_tag(self, tag_type: Literal["general", "travel", "bus"],
                 name: str, account: Account, freq: int) -> None:
         """Adds a tag.
 
@@ -278,7 +278,7 @@ class DescriptionEditor:
         accounts: dict[int, Account] \
             = {x.id: x for x in Account.query
                .filter(Account.id.in_({x.account_id for x in result})).all()}
-        debit_credit_dict: dict[t.Literal["debit", "credit"],
+        debit_credit_dict: dict[Literal["debit", "credit"],
                                 DescriptionDebitCredit] \
             = {x.debit_credit: x for x in {self.debit, self.credit}}
         for row in result:

src/accounting/journal_entry/utils/operators.py

@@ -17,19 +17,19 @@
 """The operators for different journal entry types.
 
 """
-import typing as t
 from abc import ABC, abstractmethod
+from typing import Type
 
 from flask import render_template, request, abort
 from flask_wtf import FlaskForm
 
-from accounting.models import JournalEntry
-from accounting.template_globals import default_currency_code
-from accounting.utils.journal_entry_types import JournalEntryType
 from accounting.journal_entry.forms import JournalEntryForm, \
     CashReceiptJournalEntryForm, CashDisbursementJournalEntryForm, \
     TransferJournalEntryForm
 from accounting.journal_entry.forms.line_item import LineItemForm
+from accounting.models import JournalEntry
+from accounting.template_globals import default_currency_code
+from accounting.utils.journal_entry_types import JournalEntryType
 
 
 class JournalEntryOperator(ABC):
@@ -39,7 +39,7 @@ class JournalEntryOperator(ABC):
 
     @property
     @abstractmethod
-    def form(self) -> t.Type[JournalEntryForm]:
+    def form(self) -> Type[JournalEntryForm]:
         """Returns the form class.
 
         :return: The form class.
@@ -100,7 +100,7 @@ class CashReceiptJournalEntry(JournalEntryOperator):
     """The order when checking the journal entry operator."""
 
     @property
-    def form(self) -> t.Type[JournalEntryForm]:
+    def form(self) -> Type[JournalEntryForm]:
         """Returns the form class.
 
         :return: The form class.
@@ -170,7 +170,7 @@ class CashDisbursementJournalEntry(JournalEntryOperator):
     """The order when checking the journal entry operator."""
 
     @property
-    def form(self) -> t.Type[JournalEntryForm]:
+    def form(self) -> Type[JournalEntryForm]:
         """Returns the form class.
 
         :return: The form class.
@@ -243,7 +243,7 @@ class TransferJournalEntry(JournalEntryOperator):
     """The order when checking the journal entry operator."""
 
     @property
-    def form(self) -> t.Type[JournalEntryForm]:
+    def form(self) -> Type[JournalEntryForm]:
         """Returns the form class.
 
         :return: The form class.

src/accounting/journal_entry/views.py

@@ -17,7 +17,7 @@
 """The views for the journal entry management.
 
 """
-from datetime import date
+import datetime as dt
 from urllib.parse import parse_qsl, urlencode
 
 import sqlalchemy as sa
@@ -30,9 +30,9 @@ from accounting.locale import lazy_gettext
 from accounting.models import JournalEntry
 from accounting.utils.cast import s
 from accounting.utils.flash_errors import flash_form_errors
+from accounting.utils.journal_entry_types import JournalEntryType
 from accounting.utils.next_uri import inherit_next, or_next
 from accounting.utils.permission import has_permission, can_view, can_edit
-from accounting.utils.journal_entry_types import JournalEntryType
 from accounting.utils.user import get_current_user_pk
 from .forms import sort_journal_entries_in, JournalEntryReorderForm
 from .template_filters import with_type, to_transfer, format_amount_input, \
@@ -67,7 +67,7 @@ def show_add_journal_entry_form(journal_entry_type: JournalEntryType) -> str:
         form.validate()
     else:
         form = journal_entry_op.form()
-        form.date.data = date.today()
+        form.date.data = dt.date.today()
     return journal_entry_op.render_create_template(form)
 
 
@@ -186,31 +186,31 @@ def delete_journal_entry(journal_entry: JournalEntry) -> redirect:
     return redirect(or_next(__get_default_page_uri()))
 
 
-@bp.get("dates/<date:journal_entry_date>", endpoint="order")
+@bp.get("dates/<date:date>", endpoint="order")
 @has_permission(can_view)
-def show_journal_entry_order(journal_entry_date: date) -> str:
+def show_journal_entry_order(date: dt.date) -> str:
     """Shows the order of the journal entries in a same date.
 
-    :param journal_entry_date: The date.
+    :param date: The date.
     :return: The order of the journal entries in the date.
     """
     journal_entries: list[JournalEntry] = JournalEntry.query \
-        .filter(JournalEntry.date == journal_entry_date) \
+        .filter(JournalEntry.date == date) \
         .order_by(JournalEntry.no).all()
     return render_template("accounting/journal-entry/order.html",
-                           date=journal_entry_date, list=journal_entries)
+                           date=date, list=journal_entries)
 
 
-@bp.post("dates/<date:journal_entry_date>", endpoint="sort")
+@bp.post("dates/<date:date>", endpoint="sort")
 @has_permission(can_edit)
-def sort_journal_entries(journal_entry_date: date) -> redirect:
+def sort_journal_entries(date: dt.date) -> redirect:
     """Reorders the journal entries in a date.
 
-    :param journal_entry_date: The date.
+    :param date: The date.
     :return: The redirection to the incoming account or the account list.  The
         reordering operation does not fail.
     """
-    form: JournalEntryReorderForm = JournalEntryReorderForm(journal_entry_date)
+    form: JournalEntryReorderForm = JournalEntryReorderForm(date)
     form.save_order()
     if not form.is_modified:
         flash(s(lazy_gettext("The order was not modified.")), "success")

src/accounting/models.py

@@ -21,8 +21,8 @@ from __future__ import annotations
 
 import datetime as dt
 import re
-import typing as t
 from decimal import Decimal
+from typing import Type, Self
 
 import sqlalchemy as sa
 from babel import Locale
@@ -117,21 +117,21 @@ class Account(db.Model):
     created_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of creation."""
+    """The date and time when this record was created."""
     created_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the creator."""
+    """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
-    """The creator."""
+    """The user who created the record."""
     updated_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of last update."""
+    """The date and time when this record was last updated."""
     updated_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the updator."""
+    """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
-    """The updator."""
+    """The last user who updated the record."""
     l10n: Mapped[list[AccountL10n]] \
         = db.relationship(back_populates="account", lazy=False)
     """The localized titles."""
@@ -222,13 +222,13 @@ class Account(db.Model):
         return getattr(self, "__count")
 
     @count.setter
-    def count(self, count: int) -> None:
+    def count(self, value: int) -> None:
         """Sets the number of items in the account.
 
-        :param count: The number of items in the account.
+        :param value: The number of items in the account.
         :return: None.
         """
-        setattr(self, "__count", count)
+        setattr(self, "__count", value)
 
     @property
     def query_values(self) -> list[str]:
@@ -267,11 +267,11 @@ class Account(db.Model):
         :return: None.
         """
         AccountL10n.query.filter(AccountL10n.account == self).delete()
-        cls: t.Type[t.Self] = self.__class__
+        cls: Type[Self] = self.__class__
         cls.query.filter(cls.id == self.id).delete()
 
     @classmethod
-    def find_by_code(cls, code: str) -> t.Self | None:
+    def find_by_code(cls, code: str) -> Self | None:
         """Finds an account by its code.
 
         :param code: The code.
@@ -284,7 +284,7 @@ class Account(db.Model):
                                 cls.no == int(m.group(2))).first()
 
     @classmethod
-    def selectable_debit(cls) -> list[t.Self]:
+    def selectable_debit(cls) -> list[Self]:
         """Returns the selectable debit accounts.
         Payable line items can not start from debit.
 
@@ -307,7 +307,7 @@ class Account(db.Model):
             .order_by(cls.base_code, cls.no).all()
 
     @classmethod
-    def selectable_credit(cls) -> list[t.Self]:
+    def selectable_credit(cls) -> list[Self]:
         """Returns the selectable debit accounts.
         Receivable line items can not start from credit.
 
@@ -329,7 +329,7 @@ class Account(db.Model):
             .order_by(cls.base_code, cls.no).all()
 
     @classmethod
-    def cash(cls) -> t.Self:
+    def cash(cls) -> Self:
         """Returns the cash account.
 
         :return: The cash account
@@ -337,7 +337,7 @@ class Account(db.Model):
         return cls.find_by_code(cls.CASH_CODE)
 
     @classmethod
-    def accumulated_change(cls) -> t.Self:
+    def accumulated_change(cls) -> Self:
         """Returns the accumulated-change account.
 
         :return: The accumulated-change account
@@ -373,22 +373,22 @@ class Currency(db.Model):
     created_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of creation."""
+    """The date and time when this record was created."""
     created_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the creator."""
+    """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
-    """The creator."""
+    """The user who created the record."""
     updated_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of last update."""
+    """The date and time when this record was last updated."""
     updated_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the updator."""
+    """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] \
         = db.relationship(foreign_keys=updated_by_id)
-    """The updator."""
+    """The last user who updated the record."""
     l10n: Mapped[list[CurrencyL10n]] \
         = db.relationship(back_populates="currency", lazy=False)
     """The localized names."""
@@ -467,7 +467,7 @@ class Currency(db.Model):
         :return: None.
         """
         CurrencyL10n.query.filter(CurrencyL10n.currency == self).delete()
-        cls: t.Type[t.Self] = self.__class__
+        cls: Type[Self] = self.__class__
         cls.query.filter(cls.code == self.code).delete()
 
 
@@ -546,21 +546,21 @@ class JournalEntry(db.Model):
     created_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of creation."""
+    """The date and time when this record was created."""
     created_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the creator."""
+    """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
-    """The creator."""
+    """The user who created the record."""
     updated_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of last update."""
+    """The date and time when this record was last updated."""
     updated_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the updator."""
+    """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
-    """The updator."""
+    """The last user who updated the record."""
     line_items: Mapped[list[JournalEntryLineItem]] \
         = db.relationship(back_populates="journal_entry")
     """The line items."""
@@ -735,13 +735,13 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__debit")
 
     @debit.setter
-    def debit(self, debit: Decimal | None) -> None:
+    def debit(self, value: Decimal | None) -> None:
         """Sets the debit amount.
 
-        :param debit: The debit amount.
+        :param value: The debit amount.
         :return: None.
         """
-        setattr(self, "__debit", debit)
+        setattr(self, "__debit", value)
 
     @property
     def credit(self) -> Decimal | None:
@@ -754,13 +754,13 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__credit")
 
     @credit.setter
-    def credit(self, credit: Decimal | None) -> None:
+    def credit(self, value: Decimal | None) -> None:
         """Sets the credit amount.
 
-        :param credit: The credit amount.
+        :param value: The credit amount.
         :return: None.
         """
-        setattr(self, "__credit", credit)
+        setattr(self, "__credit", value)
 
     @property
     def net_balance(self) -> Decimal:
@@ -775,42 +775,42 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__net_balance")
 
     @net_balance.setter
-    def net_balance(self, net_balance: Decimal) -> None:
+    def net_balance(self, value: Decimal) -> None:
         """Sets the net balance.
 
-        :param net_balance: The net balance.
+        :param value: The net balance.
         :return: None.
         """
-        setattr(self, "__net_balance", net_balance)
+        setattr(self, "__net_balance", value)
 
     @property
     def balance(self) -> Decimal:
-        """Returns the net balance.
+        """Returns the balance.
 
-        :return: The net balance.
+        :return: The balance.
         """
         if not hasattr(self, "__balance"):
             setattr(self, "__balance", Decimal("0"))
         return getattr(self, "__balance")
 
     @balance.setter
-    def balance(self, balance: Decimal) -> None:
-        """Sets the net balance.
+    def balance(self, value: Decimal) -> None:
+        """Sets the balance.
 
-        :param balance: The net balance.
+        :param value: The balance.
         :return: None.
         """
-        setattr(self, "__balance", balance)
+        setattr(self, "__balance", value)
 
     @property
-    def offsets(self) -> list[t.Self]:
+    def offsets(self) -> list[Self]:
         """Returns the offset items.
 
         :return: The offset items.
         """
         if not hasattr(self, "__offsets"):
-            cls: t.Type[t.Self] = self.__class__
-            offsets: list[t.Self] = cls.query.join(JournalEntry)\
+            cls: Type[Self] = self.__class__
+            offsets: list[Self] = cls.query.join(JournalEntry)\
                 .filter(JournalEntryLineItem.original_line_item_id == self.id)\
                 .order_by(JournalEntry.date, JournalEntry.no,
                           cls.is_debit, cls.no).all()
@@ -828,17 +828,16 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__is_offset")
 
     @is_offset.setter
-    def is_offset(self, is_offset: bool) -> None:
+    def is_offset(self, value: bool) -> None:
         """Sets whether the line item is an offset.
 
-        :param is_offset: True if the line item is an offset, or False
-            otherwise.
+        :param value: True if the line item is an offset, or False otherwise.
         :return: None.
         """
-        setattr(self, "__is_offset", is_offset)
+        setattr(self, "__is_offset", value)
 
     @property
-    def match(self) -> t.Self | None:
+    def match(self) -> Self | None:
         """Returns the match of the line item.
 
         :return: The match of the line item.
@@ -848,13 +847,13 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__match")
 
     @match.setter
-    def match(self, match: t.Self) -> None:
+    def match(self, value: Self) -> None:
         """Sets the match of the line item.
 
-        :param match: The matcho of the line item.
+        :param value: The matcho of the line item.
         :return: None.
         """
-        setattr(self, "__match", match)
+        setattr(self, "__match", value)
 
     @property
     def query_values(self) -> list[str]:
@@ -886,18 +885,18 @@ class Option(db.Model):
     created_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of creation."""
+    """The date and time when this record was created."""
     created_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the creator."""
+    """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
-    """The creator."""
+    """The user who created the record."""
     updated_at: Mapped[dt.datetime] \
         = mapped_column(db.DateTime(timezone=True),
                         server_default=db.func.now())
-    """The time of last update."""
+    """The date and time when this record was last updated."""
     updated_by_id: Mapped[int] \
         = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
-    """The ID of the updator."""
+    """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
-    """The updator."""
+    """The last user who updated the record."""

src/accounting/report/period/chooser.py

@@ -20,8 +20,8 @@ This file is largely taken from the NanoParma ERP project, first written in
 2021/9/16 by imacat (imacat@nanoparma.com).
 
 """
-import typing as t
-from datetime import date
+import datetime as dt
+from collections.abc import Callable
 
 from accounting.models import JournalEntry
 from .period import Period
@@ -32,13 +32,13 @@ from .shortcuts import ThisMonth, LastMonth, SinceLastMonth, ThisYear, \
 class PeriodChooser:
     """The period chooser."""
 
-    def __init__(self, get_url: t.Callable[[Period], str]):
+    def __init__(self, get_url: Callable[[Period], str]):
         """Constructs a period chooser.
 
         :param get_url: The callback to return the URL of the current report in
             a period.
         """
-        self.__get_url: t.Callable[[Period], str] = get_url
+        self.__get_url: Callable[[Period], str] = get_url
         """The callback to return the URL of the current report in a period."""
 
         # Shortcut periods
@@ -63,10 +63,10 @@ class PeriodChooser:
 
         first: JournalEntry | None \
             = JournalEntry.query.order_by(JournalEntry.date).first()
-        start: date | None = None if first is None else first.date
+        start: dt.date | None = None if first is None else first.date
 
         # Attributes
-        self.data_start: date | None = start
+        self.data_start: dt.date | None = start
         """The start of the data."""
         self.has_data: bool = start is not None
         """Whether there is any data."""
@@ -80,8 +80,8 @@ class PeriodChooser:
         """The available years."""
 
         if self.has_data:
-            today: date = date.today()
-            self.has_last_month = start < date(today.year, today.month, 1)
+            today: dt.date = dt.date.today()
+            self.has_last_month = start < dt.date(today.year, today.month, 1)
             self.has_last_year = start.year < today.year
             self.has_yesterday = start < today
             if start.year < today.year - 1:

src/accounting/report/period/description.py

@@ -17,12 +17,12 @@
 """The period description composer.
 
 """
-from datetime import date, timedelta
+import datetime as dt
 
 from accounting.locale import gettext
 
 
-def get_desc(start: date | None, end: date | None) -> str:
+def get_desc(start: dt.date | None, end: dt.date | None) -> str:
     """Returns the period description.
 
     :param start: The start of the period.
@@ -46,7 +46,7 @@ def get_desc(start: date | None, end: date | None) -> str:
     return __get_day_desc(start, end)
 
 
-def __get_since_desc(start: date) -> str:
+def __get_since_desc(start: dt.date) -> str:
     """Returns the description without the end day.
 
     :param start: The start of the period.
@@ -67,7 +67,7 @@ def __get_since_desc(start: date) -> str:
     return gettext("since %(start)s", start=get_start_desc())
 
 
-def __get_until_desc(end: date) -> str:
+def __get_until_desc(end: dt.date) -> str:
     """Returns the description without the start day.
 
     :param end: The end of the period.
@@ -81,14 +81,14 @@ def __get_until_desc(end: date) -> str:
         """
         if end.month == 12 and end.day == 31:
             return str(end.year)
-        if (end + timedelta(days=1)).day == 1:
+        if (end + dt.timedelta(days=1)).day == 1:
             return __format_month(end)
         return __format_day(end)
 
     return gettext("until %(end)s", end=get_end_desc())
 
 
-def __get_year_desc(start: date, end: date) -> str:
+def __get_year_desc(start: dt.date, end: dt.date) -> str:
     """Returns the description as a year range.
 
     :param start: The start of the period.
@@ -105,7 +105,7 @@ def __get_year_desc(start: date, end: date) -> str:
     return __get_from_to_desc(start_text, str(end.year))
 
 
-def __get_month_desc(start: date, end: date) -> str:
+def __get_month_desc(start: dt.date, end: dt.date) -> str:
     """Returns the description as a month range.
 
     :param start: The start of the period.
@@ -113,7 +113,7 @@ def __get_month_desc(start: date, end: date) -> str:
     :return: The description as a month range.
     :raise ValueError: The period is not a month range.
     """
-    if start.day != 1 or (end + timedelta(days=1)).day != 1:
+    if start.day != 1 or (end + dt.timedelta(days=1)).day != 1:
         raise ValueError
     start_text: str = __format_month(start)
     if start.year == end.year and start.month == end.month:
@@ -123,7 +123,7 @@ def __get_month_desc(start: date, end: date) -> str:
     return __get_from_to_desc(start_text, __format_month(end))
 
 
-def __get_day_desc(start: date, end: date) -> str:
+def __get_day_desc(start: dt.date, end: dt.date) -> str:
     """Returns the description as a day range.
 
     :param start: The start of the period.
@@ -142,7 +142,7 @@ def __get_day_desc(start: date, end: date) -> str:
     return __get_from_to_desc(start_text, __format_day(end))
 
 
-def __format_month(month: date) -> str:
+def __format_month(month: dt.date) -> str:
     """Formats a month.
 
     :param month: The month.
@@ -151,7 +151,7 @@ def __format_month(month: date) -> str:
     return f"{month.year}/{month.month}"
 
 
-def __format_day(day: date) -> str:
+def __format_day(day: dt.date) -> str:
     """Formats a day.
 
     :param day: The day.

src/accounting/report/period/month_end.py

@@ -18,14 +18,14 @@
 
 """
 import calendar
-from datetime import date
+import datetime as dt
 
 
-def month_end(day: date) -> date:
+def month_end(day: dt.date) -> dt.date:
     """Returns the end day of month for a date.
 
     :param day: The date.
     :return: The end day of the month of that day.
     """
     last_day: int = calendar.monthrange(day.year, day.month)[1]
-    return date(day.year, day.month, last_day)
+    return dt.date(day.year, day.month, last_day)

src/accounting/report/period/parser.py

@@ -18,9 +18,10 @@
 
 """
 import calendar
+import datetime as dt
 import re
-import typing as t
-from datetime import date
+from collections.abc import Callable
+from typing import Type
 
 from .period import Period
 from .shortcuts import ThisMonth, LastMonth, SinceLastMonth, ThisYear, \
@@ -39,7 +40,7 @@ def get_period(spec: str | None = None) -> Period:
     """
     if spec is None:
         return ThisMonth()
-    named_periods: dict[str, t.Type[t.Callable[[], Period]]] = {
+    named_periods: dict[str, Type[Callable[[], Period]]] = {
         "this-month": lambda: ThisMonth(),
         "last-month": lambda: LastMonth(),
         "since-last-month": lambda: SinceLastMonth(),
@@ -57,7 +58,7 @@ def get_period(spec: str | None = None) -> Period:
     return Period(start, end)
 
 
-def __parse_spec(text: str) -> tuple[date | None, date | None]:
+def __parse_spec(text: str) -> tuple[dt.date | None, dt.date | None]:
     """Parses the period specification.
 
     :param text: The period specification.
@@ -84,7 +85,7 @@ def __parse_spec(text: str) -> tuple[date | None, date | None]:
     raise ValueError
 
 
-def __get_start(year: str, month: str | None, day: str | None) -> date:
+def __get_start(year: str, month: str | None, day: str | None) -> dt.date:
     """Returns the start of the period from the date representation.
 
     :param year: The year.
@@ -94,13 +95,13 @@ def __get_start(year: str, month: str | None, day: str | None) -> date:
     :raise ValueError: When the date is invalid.
     """
     if day is not None:
-        return date(int(year), int(month), int(day))
+        return dt.date(int(year), int(month), int(day))
     if month is not None:
-        return date(int(year), int(month), 1)
-    return date(int(year), 1, 1)
+        return dt.date(int(year), int(month), 1)
+    return dt.date(int(year), 1, 1)
 
 
-def __get_end(year: str, month: str | None, day: str | None) -> date:
+def __get_end(year: str, month: str | None, day: str | None) -> dt.date:
     """Returns the end of the period from the date representation.
 
     :param year: The year.
@@ -110,10 +111,10 @@ def __get_end(year: str, month: str | None, day: str | None) -> date:
     :raise ValueError: When the date is invalid.
     """
     if day is not None:
-        return date(int(year), int(month), int(day))
+        return dt.date(int(year), int(month), int(day))
     if month is not None:
         year_n: int = int(year)
         month_n: int = int(month)
         day_n: int = calendar.monthrange(year_n, month_n)[1]
-        return date(year_n, month_n, day_n)
-    return date(int(year), 12, 31)
+        return dt.date(year_n, month_n, day_n)
+    return dt.date(int(year), 12, 31)

src/accounting/report/period/period.py

@@ -20,8 +20,8 @@ This file is largely taken from the NanoParma ERP project, first written in
 2021/9/16 by imacat (imacat@nanoparma.com).
 
 """
-import typing as t
-from datetime import date, timedelta
+import datetime as dt
+from typing import Self
 
 from .description import get_desc
 from .month_end import month_end
@@ -31,15 +31,15 @@ from .specification import get_spec
 class Period:
     """A date period."""
 
-    def __init__(self, start: date | None, end: date | None):
+    def __init__(self, start: dt.date | None, end: dt.date | None):
         """Constructs a new date period.
 
         :param start: The start date, or None from the very beginning.
         :param end: The end date, or None till no end.
         """
-        self.start: date | None = start
+        self.start: dt.date | None = start
         """The start of the period."""
-        self.end: date | None = end
+        self.end: dt.date | None = end
         """The end of the period."""
         self.is_default: bool = False
         """Whether the is the default period."""
@@ -95,8 +95,8 @@ class Period:
         self.is_a_month = self.start.day == 1 \
             and self.end == month_end(self.start)
         self.is_type_month = self.is_a_month
-        self.is_a_year = self.start == date(self.start.year, 1, 1) \
-            and self.end == date(self.start.year, 12, 31)
+        self.is_a_year = self.start == dt.date(self.start.year, 1, 1) \
+            and self.end == dt.date(self.start.year, 12, 31)
         self.is_a_day = self.start == self.end
 
     def is_year(self, year: int) -> bool:
@@ -119,11 +119,11 @@ class Period:
             and not self.is_a_day
 
     @property
-    def before(self) -> t.Self | None:
+    def before(self) -> Self | None:
         """Returns the period before this period.
 
         :return: The period before this period.
         """
         if self.start is None:
             return None
-        return Period(None, self.start - timedelta(days=1))
+        return Period(None, self.start - dt.timedelta(days=1))

src/accounting/report/period/shortcuts.py

@@ -17,7 +17,7 @@
 """The named shortcut periods.
 
 """
-from datetime import date, timedelta
+import datetime as dt
 
 from accounting.locale import gettext
 from .month_end import month_end
@@ -27,8 +27,8 @@ from .period import Period
 class ThisMonth(Period):
     """The period of this month."""
     def __init__(self):
-        today: date = date.today()
-        this_month_start: date = date(today.year, today.month, 1)
+        today: dt.date = dt.date.today()
+        this_month_start: dt.date = dt.date(today.year, today.month, 1)
         super().__init__(this_month_start, month_end(today))
         self.is_default = True
         self.is_this_month = True
@@ -43,13 +43,13 @@ class ThisMonth(Period):
 class LastMonth(Period):
     """The period of this month."""
     def __init__(self):
-        today: date = date.today()
+        today: dt.date = dt.date.today()
         year: int = today.year
         month: int = today.month - 1
         if month < 1:
             year = year - 1
             month = 12
-        start: date = date(year, month, 1)
+        start: dt.date = dt.date(year, month, 1)
         super().__init__(start, month_end(start))
         self.is_last_month = True
 
@@ -63,13 +63,13 @@ class LastMonth(Period):
 class SinceLastMonth(Period):
     """The period of this month."""
     def __init__(self):
-        today: date = date.today()
+        today: dt.date = dt.date.today()
         year: int = today.year
         month: int = today.month - 1
         if month < 1:
             year = year - 1
             month = 12
-        start: date = date(year, month, 1)
+        start: dt.date = dt.date(year, month, 1)
         super().__init__(start, None)
         self.is_since_last_month = True
 
@@ -82,9 +82,9 @@ class SinceLastMonth(Period):
 class ThisYear(Period):
     """The period of this year."""
     def __init__(self):
-        year: int = date.today().year
-        start: date = date(year, 1, 1)
-        end: date = date(year, 12, 31)
+        year: int = dt.date.today().year
+        start: dt.date = dt.date(year, 1, 1)
+        end: dt.date = dt.date(year, 12, 31)
         super().__init__(start, end)
         self.is_this_year = True
 
@@ -97,9 +97,9 @@ class ThisYear(Period):
 class LastYear(Period):
     """The period of last year."""
     def __init__(self):
-        year: int = date.today().year
-        start: date = date(year - 1, 1, 1)
-        end: date = date(year - 1, 12, 31)
+        year: int = dt.date.today().year
+        start: dt.date = dt.date(year - 1, 1, 1)
+        end: dt.date = dt.date(year - 1, 12, 31)
         super().__init__(start, end)
         self.is_last_year = True
 
@@ -112,7 +112,7 @@ class LastYear(Period):
 class Today(Period):
     """The period of today."""
     def __init__(self):
-        today: date = date.today()
+        today: dt.date = dt.date.today()
         super().__init__(today, today)
         self.is_today = True
 
@@ -125,7 +125,7 @@ class Today(Period):
 class Yesterday(Period):
     """The period of yesterday."""
     def __init__(self):
-        yesterday: date = date.today() - timedelta(days=1)
+        yesterday: dt.date = dt.date.today() - dt.timedelta(days=1)
         super().__init__(yesterday, yesterday)
         self.is_yesterday = True
 
@@ -163,6 +163,6 @@ class YearPeriod(Period):
 
         :param year: The year.
         """
-        start: date = date(year, 1, 1)
-        end: date = date(year, 12, 31)
+        start: dt.date = dt.date(year, 1, 1)
+        end: dt.date = dt.date(year, 12, 31)
         super().__init__(start, end)

src/accounting/report/period/specification.py

@@ -17,10 +17,10 @@
 """The period specification composer.
 
 """
-from datetime import date, timedelta
+import datetime as dt
 
 
-def get_spec(start: date | None, end: date | None) -> str:
+def get_spec(start: dt.date | None, end: dt.date | None) -> str:
     """Returns the period specification.
 
     :param start: The start of the period.
@@ -44,7 +44,7 @@ def get_spec(start: date | None, end: date | None) -> str:
     return __get_day_spec(start, end)
 
 
-def __get_since_spec(start: date) -> str:
+def __get_since_spec(start: dt.date) -> str:
     """Returns the period specification without the end day.
 
     :param start: The start of the period.
@@ -57,7 +57,7 @@ def __get_since_spec(start: date) -> str:
     return start.strftime("%Y-%m-%d-")
 
 
-def __get_until_spec(end: date) -> str:
+def __get_until_spec(end: dt.date) -> str:
     """Returns the period specification without the start day.
 
     :param end: The end of the period.
@@ -65,12 +65,12 @@ def __get_until_spec(end: date) -> str:
     """
     if end.month == 12 and end.day == 31:
         return end.strftime("-%Y")
-    if (end + timedelta(days=1)).day == 1:
+    if (end + dt.timedelta(days=1)).day == 1:
         return end.strftime("-%Y-%m")
     return end.strftime("-%Y-%m-%d")
 
 
-def __get_year_spec(start: date, end: date) -> str:
+def __get_year_spec(start: dt.date, end: dt.date) -> str:
     """Returns the period specification as a year range.
 
     :param start: The start of the period.
@@ -88,7 +88,7 @@ def __get_year_spec(start: date, end: date) -> str:
     return f"{start_spec}-{end_spec}"
 
 
-def __get_month_spec(start: date, end: date) -> str:
+def __get_month_spec(start: dt.date, end: dt.date) -> str:
     """Returns the period specification as a month range.
 
     :param start: The start of the period.
@@ -96,7 +96,7 @@ def __get_month_spec(start: date, end: date) -> str:
     :return: The period specification as a month range.
     :raise ValueError: The period is not a month range.
     """
-    if start.day != 1 or (end + timedelta(days=1)).day != 1:
+    if start.day != 1 or (end + dt.timedelta(days=1)).day != 1:
         raise ValueError
     start_spec: str = start.strftime("%Y-%m")
     if start.year == end.year and start.month == end.month:
@@ -105,7 +105,7 @@ def __get_month_spec(start: date, end: date) -> str:
     return f"{start_spec}-{end_spec}"
 
 
-def __get_day_spec(start: date, end: date) -> str:
+def __get_day_spec(start: dt.date, end: dt.date) -> str:
     """Returns the period specification as a day range.
 
     :param start: The start of the period.

src/accounting/report/reports/income_expenses.py

@@ -17,7 +17,7 @@
 """The income and expenses log.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -53,7 +53,7 @@ class ReportLineItem:
         """Whether this is the brought-forward line item."""
         self.is_total: bool = False
         """Whether this is the total line item."""
-        self.date: date | None = None
+        self.date: dt.date | None = None
         """The date."""
         self.account: Account | None = None
         """The account."""
@@ -213,7 +213,7 @@ class LineItemCollector:
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, journal_entry_date: date | str | None,
+    def __init__(self, date: dt.date | str | None,
                  account: str | None,
                  description: str | None,
                  income: str | Decimal | None,
@@ -222,7 +222,7 @@ class CSVRow(BaseCSVRow):
                  note: str | None):
         """Constructs a row in the CSV.
 
-        :param journal_entry_date: The journal entry date.
+        :param date: The journal entry date.
         :param account: The account.
         :param description: The description.
         :param income: The income.
@@ -230,7 +230,7 @@ class CSVRow(BaseCSVRow):
         :param balance: The balance.
         :param note: The note.
         """
-        self.date: date | str | None = journal_entry_date
+        self.date: dt.date | str | None = date
         """The date."""
         self.account: str | None = account
         """The account."""

src/accounting/report/reports/journal.py

@@ -17,7 +17,7 @@
 """The journal.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -67,7 +67,7 @@ class ReportLineItem:
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, journal_entry_date: str | date,
+    def __init__(self, journal_entry_date: str | dt.date,
                  currency: str,
                  account: str,
                  description: str | None,
@@ -84,7 +84,7 @@ class CSVRow(BaseCSVRow):
         :param credit: The credit amount.
         :param note: The note.
         """
-        self.date: str | date = journal_entry_date
+        self.date: str | dt.date = journal_entry_date
         """The date."""
         self.currency: str = currency
         """The currency."""

src/accounting/report/reports/ledger.py

@@ -17,7 +17,7 @@
 """The ledger.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -52,7 +52,7 @@ class ReportLineItem:
         """Whether this is the brought-forward line item."""
         self.is_total: bool = False
         """Whether this is the total line item."""
-        self.date: date | None = None
+        self.date: dt.date | None = None
         """The date."""
         self.description: str | None = None
         """The description."""
@@ -196,7 +196,7 @@ class LineItemCollector:
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, journal_entry_date: date | str | None,
+    def __init__(self, date: dt.date | str | None,
                  description: str | None,
                  debit: str | Decimal | None,
                  credit: str | Decimal | None,
@@ -204,14 +204,14 @@ class CSVRow(BaseCSVRow):
                  note: str | None):
         """Constructs a row in the CSV.
 
-        :param journal_entry_date: The journal entry date.
+        :param date: The journal entry date.
         :param description: The description.
         :param debit: The debit amount.
         :param credit: The credit amount.
         :param balance: The balance.
         :param note: The note.
         """
-        self.date: date | str | None = journal_entry_date
+        self.date: dt.date | str | None = date
         """The date."""
         self.description: str | None = description
         """The description."""

src/accounting/report/reports/search.py

@@ -17,7 +17,7 @@
 """The search.
 
 """
-from datetime import datetime
+import datetime as dt
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -124,40 +124,33 @@ class LineItemCollector:
         """
         conditions: list[sa.BinaryExpression] \
             = [JournalEntry.note.icontains(k)]
-        journal_entry_date: datetime
+        date: dt.datetime
         try:
-            journal_entry_date = datetime.strptime(k, "%Y")
-            conditions.append(sa.extract("year", JournalEntry.date)
-                              == journal_entry_date.year)
+            date = dt.datetime.strptime(k, "%Y")
+            conditions.append(
+                sa.extract("year", JournalEntry.date) == date.year)
         except ValueError:
             pass
         try:
-            journal_entry_date = datetime.strptime(k, "%Y/%m")
+            date = dt.datetime.strptime(k, "%Y/%m")
             conditions.append(sa.and_(
-                sa.extract("year", JournalEntry.date)
-                == journal_entry_date.year,
-                sa.extract("month", JournalEntry.date)
-                == journal_entry_date.month))
+                sa.extract("year", JournalEntry.date) == date.year,
+                sa.extract("month", JournalEntry.date) == date.month))
         except ValueError:
             pass
         try:
-            journal_entry_date = datetime.strptime(f"2000/{k}", "%Y/%m/%d")
+            date = dt.datetime.strptime(f"2000/{k}", "%Y/%m/%d")
             conditions.append(sa.and_(
-                sa.extract("month", JournalEntry.date)
-                == journal_entry_date.month,
-                sa.extract("day", JournalEntry.date)
-                == journal_entry_date.day))
+                sa.extract("month", JournalEntry.date) == date.month,
+                sa.extract("day", JournalEntry.date) == date.day))
         except ValueError:
             pass
         try:
-            journal_entry_date = datetime.strptime(k, "%Y/%m/%d")
+            date = dt.datetime.strptime(k, "%Y/%m/%d")
             conditions.append(sa.and_(
-                sa.extract("year", JournalEntry.date)
-                == journal_entry_date.year,
-                sa.extract("month", JournalEntry.date)
-                == journal_entry_date.month,
-                sa.extract("day", JournalEntry.date)
-                == journal_entry_date.day))
+                sa.extract("year", JournalEntry.date) == date.year,
+                sa.extract("month", JournalEntry.date) == date.month,
+                sa.extract("day", JournalEntry.date) == date.day))
         except ValueError:
             pass
         return sa.select(JournalEntry.id).filter(sa.or_(*conditions))

src/accounting/report/reports/unapplied.py

@@ -17,7 +17,7 @@
 """The unapplied original line items.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 from flask import render_template, Response
@@ -41,7 +41,7 @@ from accounting.utils.pagination import Pagination
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, journal_entry_date: str | date, currency: str,
+    def __init__(self, journal_entry_date: str | dt.date, currency: str,
                  description: str | None, amount: str | Decimal,
                  net_balance: str | Decimal):
         """Constructs a row in the CSV.
@@ -52,7 +52,7 @@ class CSVRow(BaseCSVRow):
         :param amount: The amount.
         :param net_balance: The net balance.
         """
-        self.date: str | date = journal_entry_date
+        self.date: str | dt.date = journal_entry_date
         """The date."""
         self.currency: str = currency
         """The currency."""
@@ -64,7 +64,7 @@ class CSVRow(BaseCSVRow):
         """The net balance."""
 
     @property
-    def values(self) -> list[str | date | Decimal | None]:
+    def values(self) -> list[str | dt.date | Decimal | None]:
         """Returns the values of the row.
 
         :return: The values of the row.

src/accounting/report/reports/unapplied_accounts.py

@@ -17,7 +17,7 @@
 """The accounts with unapplied original line items.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 from flask import render_template, Response
@@ -49,7 +49,7 @@ class CSVRow(BaseCSVRow):
         """The number of unapplied original line items."""
 
     @property
-    def values(self) -> list[str | date | Decimal | None]:
+    def values(self) -> list[str | dt.date | Decimal | None]:
         """Returns the values of the row.
 
         :return: The values of the row.
@@ -143,7 +143,7 @@ class AccountsWithUnappliedOriginalLineItems(BaseReport):
 
         :return: The response of the report for download.
         """
-        filename: str = f"unapplied-accounts.csv"
+        filename: str = "unapplied-accounts.csv"
         return csv_download(filename, get_csv_rows(self.__accounts))
 
     def html(self) -> str:

src/accounting/report/reports/unmatched.py

@@ -17,7 +17,7 @@
 """The unmatched offsets.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 from flask import render_template, Response
@@ -40,7 +40,7 @@ from accounting.utils.pagination import Pagination
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, journal_entry_date: str | date, currency: str,
+    def __init__(self, journal_entry_date: str | dt.date, currency: str,
                  description: str | None, debit: str | Decimal,
                  credit: str | Decimal, balance: str | Decimal):
         """Constructs a row in the CSV.
@@ -52,7 +52,7 @@ class CSVRow(BaseCSVRow):
         :param credit: The credit amount.
         :param balance: The balance.
         """
-        self.date: str | date = journal_entry_date
+        self.date: str | dt.date = journal_entry_date
         """The date."""
         self.currency: str = currency
         """The currency."""
@@ -66,7 +66,7 @@ class CSVRow(BaseCSVRow):
         """The balance."""
 
     @property
-    def values(self) -> list[str | date | Decimal | None]:
+    def values(self) -> list[str | dt.date | Decimal | None]:
         """Returns the values of the row.
 
         :return: The values of the row.

src/accounting/report/reports/unmatched_accounts.py

@@ -17,7 +17,7 @@
 """The accounts with unmatched offsets.
 
 """
-from datetime import date
+import datetime as dt
 from decimal import Decimal
 
 from flask import render_template, Response
@@ -49,7 +49,7 @@ class CSVRow(BaseCSVRow):
         """The number of unapplied original line items."""
 
     @property
-    def values(self) -> list[str | date | Decimal | None]:
+    def values(self) -> list[str | dt.date | Decimal | None]:
         """Returns the values of the row.
 
         :return: The values of the row.
@@ -144,7 +144,7 @@ class AccountsWithUnmatchedOffsets(BaseReport):
 
         :return: The response of the report for download.
         """
-        filename: str = f"unapplied-accounts.csv"
+        filename: str = "unmatched-accounts.csv"
         return csv_download(filename, get_csv_rows(self.__accounts))
 
     def html(self) -> str:

src/accounting/report/utils/base_page_params.py

@@ -17,8 +17,9 @@
 """The page parameters of a report.
 
 """
-import typing as t
 from abc import ABC, abstractmethod
+from collections.abc import Callable
+from typing import Type
 from urllib.parse import urlparse, ParseResult, parse_qsl, urlencode, \
     urlunparse
 
@@ -52,7 +53,7 @@ class BasePageParams(ABC):
         """
 
     @property
-    def journal_entry_types(self) -> t.Type[JournalEntryType]:
+    def journal_entry_types(self) -> Type[JournalEntryType]:
         """Returns the journal entry types.
 
         :return: The journal entry types.
@@ -72,7 +73,7 @@ class BasePageParams(ABC):
         return urlunparse(parts)
 
     @staticmethod
-    def _get_currency_options(get_url: t.Callable[[Currency], str],
+    def _get_currency_options(get_url: Callable[[Currency], str],
                               active_currency: Currency) -> list[OptionLink]:
         """Returns the currency options.
 

src/accounting/report/utils/csv_export.py

@@ -18,8 +18,8 @@
 
 """
 import csv
+import datetime as dt
 from abc import ABC, abstractmethod
-from datetime import timedelta, date
 from decimal import Decimal
 from io import StringIO
 from urllib.parse import quote
@@ -77,7 +77,7 @@ def period_spec(period: Period) -> str:
     return f"{start}-{end}"
 
 
-def __get_start_str(start: date | None) -> str | None:
+def __get_start_str(start: dt.date | None) -> str | None:
     """Returns the string representation of the start date.
 
     :param start: The start date.
@@ -93,7 +93,7 @@ def __get_start_str(start: date | None) -> str | None:
     return start.strftime("%Y%m%d")
 
 
-def __get_end_str(end: date | None) -> str | None:
+def __get_end_str(end: dt.date | None) -> str | None:
     """Returns the string representation of the end date.
 
     :param end: The end date.
@@ -104,6 +104,6 @@ def __get_end_str(end: date | None) -> str | None:
         return None
     if end.month == 12 and end.day == 31:
         return str(end.year)
-    if (end + timedelta(days=1)).day == 1:
+    if (end + dt.timedelta(days=1)).day == 1:
         return end.strftime("%Y%m")
     return end.strftime("%Y%m%d")

src/accounting/report/utils/report_chooser.py

@@ -21,7 +21,7 @@ This file is largely taken from the NanoParma ERP project, first written in
 
 """
 import re
-import typing as t
+from collections.abc import Iterator
 
 from flask_babel import LazyString
 
@@ -190,7 +190,7 @@ class ReportChooser:
                           self.__active_report == ReportType.UNMATCHED,
                           fa_icon="fa-solid fa-file-circle-question")
 
-    def __iter__(self) -> t.Iterator[OptionLink]:
+    def __iter__(self) -> Iterator[OptionLink]:
         """Returns the iteration of the reports.
 
         :return: The iteration of the reports.

src/accounting/static/js/journal-entry-line-item-editor.js

@@ -276,7 +276,6 @@ class JournalEntryLineItemEditor {
         this.originalLineItemDate = originalLineItem.date;
         this.originalLineItemText = originalLineItem.text;
         this.#originalLineItemText.innerText = originalLineItem.text;
-        this.#setEnableDescriptionAccount(false);
         if (this.description === null) {
             if (originalLineItem.description === "") {
                 this.#descriptionControl.classList.remove("accounting-not-empty");

src/accounting/template_filters.py

@@ -17,9 +17,9 @@
 """The template filters.
 
 """
-import typing as t
-from datetime import date, timedelta
+import datetime as dt
 from decimal import Decimal
+from typing import Any
 
 from flask_babel import get_locale
 
@@ -41,24 +41,24 @@ def format_amount(value: Decimal | None) -> str | None:
     return "{:,}".format(whole) + str(abs(frac))[1:]
 
 
-def format_date(value: date) -> str:
+def format_date(value: dt.date) -> str:
     """Formats a date to be human-friendly.
 
     :param value: The date.
     :return: The human-friendly date text.
     """
-    today: date = date.today()
+    today: dt.date = dt.date.today()
     if value == today:
         return gettext("Today")
-    if value == today - timedelta(days=1):
+    if value == today - dt.timedelta(days=1):
         return gettext("Yesterday")
-    if value == today + timedelta(days=1):
+    if value == today + dt.timedelta(days=1):
         return gettext("Tomorrow")
     locale = str(get_locale())
     if locale == "zh" or locale.startswith("zh_"):
-        if value == today - timedelta(days=2):
+        if value == today - dt.timedelta(days=2):
             return gettext("The day before yesterday")
-        if value == today + timedelta(days=2):
+        if value == today + dt.timedelta(days=2):
             return gettext("The day after tomorrow")
     if locale == "zh" or locale.startswith("zh_"):
         weekdays = ["一", "二", "三", "四", "五", "六", "日"]
@@ -71,7 +71,7 @@ def format_date(value: date) -> str:
     return "{}/{}({})".format(value.month, value.day, weekday)
 
 
-def default(value: t.Any, default_value: t.Any = "") -> t.Any:
+def default(value: Any, default_value: Any = "") -> Any:
     """Returns the default value if the given value is None.
 
     :param value: The value.

src/accounting/templates/accounting/journal-entry/include/detail.html

@@ -36,7 +36,7 @@ First written: 2023/2/26
       {{ A_("Edit") }}
     </a>
   {% endif %}
-  <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.order", journal_entry_date=obj.date)|accounting_append_next }}">
+  <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.order", date=obj.date)|accounting_append_next }}">
     <i class="fa-solid fa-bars-staggered"></i>
     <span class="d-none d-md-inline">{{ A_("Order") }}</span>
   </a>

src/accounting/templates/accounting/journal-entry/order.html

@@ -38,7 +38,7 @@ First written: 2023/2/26
 </div>
 
 {% if list|length > 1 and accounting_can_edit() %}
-  <form action="{{ url_for("accounting.journal-entry.sort", journal_entry_date=date) }}" method="post">
+  <form action="{{ url_for("accounting.journal-entry.sort", date=date) }}" method="post">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     {% if request.args.next %}
       <input type="hidden" name="next" value="{{ request.args.next }}">

src/accounting/utils/cast.py

@@ -20,12 +20,10 @@ warnings from the IDE.
 This module should not import any other module from the application.
 
 """
-import typing as t
-
-import sqlalchemy as sa
+from typing import Any
 
 
-def s(message: t.Any) -> str:
+def s(message: Any) -> str:
     """Casts the LazyString message to the string type.
 
     :param message: The message.

src/accounting/utils/current_account.py

@@ -17,12 +17,13 @@
 """The current assets and liabilities account.
 
 """
-import typing as t
+from typing import Self
+
+import sqlalchemy as sa
 
 from accounting import db
 from accounting.locale import gettext
 from accounting.models import Account
-import sqlalchemy as sa
 
 
 class CurrentAccount:
@@ -54,7 +55,7 @@ class CurrentAccount:
         return self.str
 
     @classmethod
-    def current_assets_and_liabilities(cls) -> t.Self:
+    def current_assets_and_liabilities(cls) -> Self:
         """Returns the pseudo account for all current assets and liabilities.
 
         :return: The pseudo account for all current assets and liabilities.
@@ -67,7 +68,7 @@ class CurrentAccount:
         return account
 
     @classmethod
-    def accounts(cls) -> list[t.Self]:
+    def accounts(cls) -> list[Self]:
         """Returns the current assets and liabilities accounts.
 
         :return: The current assets and liabilities accounts.

src/accounting/utils/flash_errors.py

@@ -19,7 +19,7 @@
 This module should not import any other module from the application.
 
 """
-import typing as t
+from typing import Any
 
 from flask import flash
 from flask_wtf import FlaskForm
@@ -34,7 +34,7 @@ def flash_form_errors(form: FlaskForm) -> None:
     __flash_errors(form.errors)
 
 
-def __flash_errors(error: t.Any) -> None:
+def __flash_errors(error: Any) -> None:
     """Flash all errors recursively.
 
     :param error: The errors.

src/accounting/utils/offset_alias.py

@@ -17,7 +17,7 @@
 """The SQLAlchemy alias for the offset items.
 
 """
-import typing as t
+from typing import Any
 
 import sqlalchemy as sa
 
@@ -30,10 +30,10 @@ def offset_alias() -> sa.Alias:
     :return: The SQLAlchemy alias for the offset items.
     """
 
-    def as_from(model_cls: t.Any) -> sa.FromClause:
+    def as_from(model_cls: Any) -> sa.FromClause:
         return model_cls
 
-    def as_alias(alias: t.Any) -> sa.Alias:
+    def as_alias(alias: Any) -> sa.Alias:
         return alias
 
     return as_alias(sa.alias(as_from(JournalEntryLineItem), name="offset"))

src/accounting/utils/pagination.py

@@ -19,7 +19,7 @@
 This module should not import any other module from the application.
 
 """
-import typing as t
+from typing import TypeVar, Generic
 from urllib.parse import urlparse, parse_qsl, urlencode, urlunparse, \
     ParseResult
 
@@ -62,10 +62,10 @@ class Redirection(RequestRedirect):
 DEFAULT_PAGE_SIZE: int = 10
 """The default page size."""
 
-T = t.TypeVar("T")
+T = TypeVar("T")
 
 
-class Pagination(t.Generic[T]):
+class Pagination(Generic[T]):
     """The pagination utility."""
 
     def __init__(self, items: list[T], is_reversed: bool = False):
@@ -91,7 +91,7 @@ class Pagination(t.Generic[T]):
         """The options to the number of items in a page."""
 
 
-class AbstractPagination(t.Generic[T]):
+class AbstractPagination(Generic[T]):
     """An abstract pagination."""
 
     def __init__(self):

src/accounting/utils/permission.py

@@ -19,21 +19,21 @@
 This module should not import any other module from the application.
 
 """
-import typing as t
+from collections.abc import Callable
 
 from flask import abort, Blueprint, Response
 
 from accounting.utils.user import get_current_user, UserUtilityInterface
 
 
-def has_permission(rule: t.Callable[[], bool]) -> t.Callable:
+def has_permission(rule: Callable[[], bool]) -> Callable:
     """The permission decorator to check whether the current user is allowed.
 
     :param rule: The permission rule.
     :return: The view decorator.
     """
 
-    def decorator(view: t.Callable) -> t.Callable:
+    def decorator(view: Callable) -> Callable:
         """The view decorator to decorate a view with permission tests.
 
         :param view: The view.
@@ -61,16 +61,16 @@ def has_permission(rule: t.Callable[[], bool]) -> t.Callable:
     return decorator
 
 
-__can_view_func: t.Callable[[], bool] = lambda: True
+__can_view_func: Callable[[], bool] = lambda: True
 """The callback that returns whether the current user can view the accounting
 data."""
-__can_edit_func: t.Callable[[], bool] = lambda: True
+__can_edit_func: Callable[[], bool] = lambda: True
 """The callback that returns whether the current user can edit the accounting
 data."""
-__can_admin_func: t.Callable[[], bool] = lambda: True
+__can_admin_func: Callable[[], bool] = lambda: True
 """The callback that returns whether the current user can administrate the
 accounting settings."""
-_unauthorized_func: t.Callable[[], Response | None] \
+_unauthorized_func: Callable[[], Response | None] \
     = lambda: Response(status=403)
 """The callback that returns the response to require the user to log in."""
 

src/accounting/utils/random_id.py

@@ -14,22 +14,22 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""The random ID mixin for the data models.
+"""The random ID utility for the data models.
 
 This module should not import any other module from the application.
 
 """
-import typing as t
 from secrets import randbelow
+from typing import Type
 
 from accounting import db
 
 
-def new_id(cls: t.Type):
-    """Returns a new random ID for the data model.
+def new_id(cls: Type[db.Model]):
+    """Generates and returns a new, unused random ID for the data model.
 
     :param cls: The data model.
-    :return: The generated new random ID.
+    :return: The newly-generated, unused random ID.
     """
     while True:
         obj_id: int = 100000000 + randbelow(900000000)

src/accounting/utils/user.py

@@ -19,17 +19,17 @@
 This module should not import any other module from the application.
 
 """
-import typing as t
 from abc import ABC, abstractmethod
+from typing import TypeVar, Generic, Type
 
 import sqlalchemy as sa
 from flask import g, Response
 from flask_sqlalchemy.model import Model
 
-T = t.TypeVar("T", bound=Model)
+T = TypeVar("T", bound=Model)
 
 
-class UserUtilityInterface(t.Generic[T], ABC):
+class UserUtilityInterface(Generic[T], ABC):
     """The interface for the user utilities."""
 
     @abstractmethod
@@ -72,7 +72,7 @@ class UserUtilityInterface(t.Generic[T], ABC):
 
     @property
     @abstractmethod
-    def cls(self) -> t.Type[T]:
+    def cls(self) -> Type[T]:
         """Returns the class of the user data model.
 
         :return: The class of the user data model.
@@ -112,7 +112,7 @@ class UserUtilityInterface(t.Generic[T], ABC):
 
 __user_utils: UserUtilityInterface
 """The user utilities."""
-user_cls: t.Type[Model] = Model
+user_cls: Type[Model] = Model
 """The user class."""
 user_pk_column: sa.Column = sa.Column(sa.Integer)
 """The primary key column of the user class."""

tests/test_account.py

@@ -17,8 +17,8 @@
 """The test for the account management.
 
 """
+import datetime as dt
 import unittest
-from datetime import timedelta, date
 
 import httpx
 from flask import Flask
@@ -461,7 +461,7 @@ class AccountTestCase(unittest.TestCase):
             account = Account.find_by_code(CASH.code)
             self.assertIsNotNone(account)
             account.created_at \
-                = account.created_at - timedelta(seconds=5)
+                = account.created_at - dt.timedelta(seconds=5)
             account.updated_at = account.created_at
             db.session.commit()
 
@@ -592,7 +592,7 @@ class AccountTestCase(unittest.TestCase):
         add_journal_entry(self.client,
                           form={"csrf_token": self.csrf_token,
                                 "next": NEXT_URI,
-                                "date": date.today().isoformat(),
+                                "date": dt.date.today().isoformat(),
                                 "currency-1-code": "USD",
                                 "currency-1-credit-1-account_code": BANK.code,
                                 "currency-1-credit-1-amount": "20"})

tests/test_commands.py

@@ -18,8 +18,8 @@
 
 """
 import csv
-import typing as t
 import unittest
+from typing import Any
 
 import sqlalchemy as sa
 from click.testing import Result
@@ -80,7 +80,7 @@ class ConsoleCommandTestCase(unittest.TestCase):
         from accounting.models import BaseAccount
 
         with open(data_dir / "base_accounts.csv") as fp:
-            data: dict[dict[str, t.Any]] \
+            data: dict[dict[str, Any]] \
                 = {x["code"]: {"code": x["code"],
                                "title": x["title"],
                                "l10n": {y[5:]: x[y]
@@ -135,7 +135,7 @@ class ConsoleCommandTestCase(unittest.TestCase):
         from accounting.models import Currency
 
         with open(data_dir / "currencies.csv") as fp:
-            data: dict[dict[str, t.Any]] \
+            data: dict[dict[str, Any]] \
                 = {x["code"]: {"code": x["code"],
                                "name": x["name"],
                                "l10n": {y[5:]: x[y]

tests/test_currency.py

@@ -17,8 +17,8 @@
 """The test for the currency management.
 
 """
+import datetime as dt
 import unittest
-from datetime import timedelta, date
 
 import httpx
 from flask import Flask
@@ -384,7 +384,7 @@ class CurrencyTestCase(unittest.TestCase):
             currency = db.session.get(Currency, USD.code)
             self.assertIsNotNone(currency)
             currency.created_at \
-                = currency.created_at - timedelta(seconds=5)
+                = currency.created_at - dt.timedelta(seconds=5)
             currency.updated_at = currency.created_at
             db.session.commit()
 
@@ -534,7 +534,7 @@ class CurrencyTestCase(unittest.TestCase):
         add_journal_entry(self.client,
                           form={"csrf_token": self.csrf_token,
                                 "next": NEXT_URI,
-                                "date": date.today().isoformat(),
+                                "date": dt.date.today().isoformat(),
                                 "currency-1-code": EUR.code,
                                 "currency-1-credit-1-account_code": "1111-001",
                                 "currency-1-credit-1-amount": "20"})

tests/test_description_editor.py

@@ -17,8 +17,8 @@
 """The test for the description editor.
 
 """
+import datetime as dt
 import unittest
-from datetime import date
 
 from flask import Flask
 
@@ -149,7 +149,7 @@ def get_form_data(csrf_token: str) -> list[dict[str, str]]:
     :param csrf_token: The CSRF token.
     :return: A list of the form data.
     """
-    journal_entry_date: str = date.today().isoformat()
+    journal_entry_date: str = dt.date.today().isoformat()
     return [{"csrf_token": csrf_token,
              "next": NEXT_URI,
              "date": journal_entry_date,

tests/test_journal_entry.py

@@ -17,8 +17,8 @@
 """The test for the journal entry management.
 
 """
+import datetime as dt
 import unittest
-from datetime import date, timedelta
 from decimal import Decimal
 
 import httpx
@@ -500,7 +500,7 @@ class CashReceiptJournalEntryTestCase(unittest.TestCase):
             journal_entry = db.session.get(JournalEntry, journal_entry_id)
             self.assertIsNotNone(journal_entry)
             journal_entry.created_at \
-                = journal_entry.created_at - timedelta(seconds=5)
+                = journal_entry.created_at - dt.timedelta(seconds=5)
             journal_entry.updated_at = journal_entry.created_at
             db.session.commit()
 
@@ -576,7 +576,7 @@ class CashReceiptJournalEntryTestCase(unittest.TestCase):
             self.client,
             form={"csrf_token": self.csrf_token,
                   "next": NEXT_URI,
-                  "date": date.today().isoformat(),
+                  "date": dt.date.today().isoformat(),
                   "currency-1-code": line_item.currency_code,
                   "currency-1-debit-1-original_line_item_id": line_item.id,
                   "currency-1-debit-1-account_code": line_item.account_code,
@@ -1112,7 +1112,7 @@ class CashDisbursementJournalEntryTestCase(unittest.TestCase):
             journal_entry = db.session.get(JournalEntry, journal_entry_id)
             self.assertIsNotNone(journal_entry)
             journal_entry.created_at \
-                = journal_entry.created_at - timedelta(seconds=5)
+                = journal_entry.created_at - dt.timedelta(seconds=5)
             journal_entry.updated_at = journal_entry.created_at
             db.session.commit()
 
@@ -1773,7 +1773,7 @@ class TransferJournalEntryTestCase(unittest.TestCase):
             journal_entry = db.session.get(JournalEntry, journal_entry_id)
             self.assertIsNotNone(journal_entry)
             journal_entry.created_at \
-                = journal_entry.created_at - timedelta(seconds=5)
+                = journal_entry.created_at - dt.timedelta(seconds=5)
             journal_entry.updated_at = journal_entry.created_at
             db.session.commit()
 
@@ -2124,9 +2124,9 @@ class JournalEntryReorderTestCase(unittest.TestCase):
 
         with self.app.app_context():
             journal_entry_1: JournalEntry = db.session.get(JournalEntry, id_1)
-            journal_entry_date_2: date = journal_entry_1.date
-            journal_entry_date_1: date \
-                = journal_entry_date_2 - timedelta(days=1)
+            journal_entry_date_2: dt.date = journal_entry_1.date
+            journal_entry_date_1: dt.date \
+                = journal_entry_date_2 - dt.timedelta(days=1)
             journal_entry_1.date = journal_entry_date_1
             journal_entry_1.no = 3
             journal_entry_2: JournalEntry = db.session.get(JournalEntry, id_2)
@@ -2176,10 +2176,10 @@ class JournalEntryReorderTestCase(unittest.TestCase):
                                       self.__get_add_disbursement_form())
 
         with self.app.app_context():
-            journal_entry_date: date = db.session.get(JournalEntry, id_1).date
+            date: dt.date = db.session.get(JournalEntry, id_1).date
 
         response = self.client.post(
-            f"{PREFIX}/dates/{journal_entry_date.isoformat()}",
+            f"{PREFIX}/dates/{date.isoformat()}",
             data={"csrf_token": self.csrf_token,
                   "next": "/next",
                   f"{id_1}-no": "4",
@@ -2207,7 +2207,7 @@ class JournalEntryReorderTestCase(unittest.TestCase):
             db.session.commit()
 
         response = self.client.post(
-            f"{PREFIX}/dates/{journal_entry_date.isoformat()}",
+            f"{PREFIX}/dates/{date.isoformat()}",
             data={"csrf_token": self.csrf_token,
                   "next": "/next",
                   f"{id_2}-no": "3a",

tests/test_option.py

@@ -17,8 +17,8 @@
 """The test for the options.
 
 """
+import datetime as dt
 import unittest
-from datetime import datetime, timedelta
 
 import httpx
 from flask import Flask
@@ -286,7 +286,8 @@ class OptionTestCase(unittest.TestCase):
         with self.app.app_context():
             option = db.session.get(Option, "recurring")
             self.assertIsNotNone(option)
-            timestamp: datetime = option.created_at - timedelta(seconds=5)
+            timestamp: dt.datetime \
+                = option.created_at - dt.timedelta(seconds=5)
             option.created_at = timestamp
             option.updated_at = timestamp
             db.session.commit()

tests/test_report.py

@@ -17,8 +17,8 @@
 """The test for the reports.
 
 """
+import datetime as dt
 import unittest
-from datetime import date
 
 import httpx
 from flask import Flask
@@ -446,15 +446,15 @@ class ReportTestData(BaseTestData):
     """The report test data."""
 
     def _init_data(self) -> None:
-        today: date = date.today()
+        today: dt.date = dt.date.today()
         year: int = today.year - 5
         month: int = today.month
         while True:
-            j_date: date = date(year, month, 5)
-            if j_date > today:
+            date: dt.date = dt.date(year, month, 5)
+            if date > today:
                 break
             self._add_simple_journal_entry(
-                (j_date - today).days, "USD",
+                (date - today).days, "USD",
                 "Salary薪水", "1200", Accounts.BANK, Accounts.SERVICE)
             month = month + 1
             if month > 12:

tests/test_site/__init__.py

@@ -18,8 +18,8 @@
 
 """
 import os
-import typing as t
 from secrets import token_urlsafe
+from typing import Type
 
 from click.testing import Result
 from flask import Flask, Blueprint, render_template, redirect, Response, \
@@ -94,7 +94,7 @@ def create_app(is_testing: bool = False) -> Flask:
             return redirect(append_next(url_for("auth.login-form")))
 
         @property
-        def cls(self) -> t.Type[auth.User]:
+        def cls(self) -> Type[auth.User]:
             return auth.User
 
         @property

tests/test_site/auth.py

@@ -17,24 +17,25 @@
 """The authentication for the Mia! Accounting demonstration website.
 
 """
-import typing as t
+from collections.abc import Callable
 
 from flask import Blueprint, render_template, Flask, redirect, url_for, \
     session, request, g, Response, abort
+from sqlalchemy.orm import Mapped, mapped_column
 
 from . import db
 
 bp: Blueprint = Blueprint("auth", __name__, url_prefix="/")
+"""The authentication blueprint."""
 
 
 class User(db.Model):
     """A user."""
     __tablename__ = "users"
     """The table name."""
-    id = db.Column(db.Integer, nullable=False, primary_key=True,
-                   autoincrement=True)
-    """The ID"""
-    username = db.Column(db.String, nullable=False, unique=True)
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    """The ID."""
+    username: Mapped[str] = mapped_column(unique=True)
     """The username."""
 
     def __str__(self) -> str:
@@ -95,7 +96,7 @@ def current_user() -> User | None:
     return g.user
 
 
-def admin_required(view: t.Callable) -> t.Callable:
+def admin_required(view: Callable) -> Callable:
     """The view decorator to require the user to be an administrator.
 
     :param view: The view.

tests/test_site/lib.py

@@ -19,11 +19,11 @@
 """
 from __future__ import annotations
 
-import typing as t
+import datetime as dt
 from abc import ABC, abstractmethod
-from datetime import date, timedelta
 from decimal import Decimal
 from secrets import randbelow
+from typing import Any
 
 import sqlalchemy as sa
 from flask import Flask
@@ -167,10 +167,10 @@ class JournalEntryData:
         :param is_update: True for an update operation, or False otherwise
         :return: The journal entry as a form.
         """
-        journal_entry_date: date = date.today() - timedelta(days=self.days)
+        date: dt.date = dt.date.today() - dt.timedelta(days=self.days)
         form: dict[str, str] = {"csrf_token": csrf_token,
                                 "next": next_uri,
-                                "date": journal_entry_date.isoformat()}
+                                "date": date.isoformat()}
         for i in range(len(self.currencies)):
             form.update(self.currencies[i].form(i + 1, is_update))
         if self.note is not None:
@@ -193,8 +193,8 @@ class BaseTestData(ABC):
                 .filter(User.username == username).first()
             assert current_user is not None
             self.__current_user_id: int = current_user.id
-            self.__journal_entries: list[dict[str, t.Any]] = []
-            self.__line_items: list[dict[str, t.Any]] = []
+            self.__journal_entries: list[dict[str, Any]] = []
+            self.__line_items: list[dict[str, Any]] = []
             self._init_data()
 
     @abstractmethod
@@ -240,11 +240,12 @@ class BaseTestData(ABC):
         existing_j_id: set[int] = {x["id"] for x in self.__journal_entries}
         existing_l_id: set[int] = {x["id"] for x in self.__line_items}
         journal_entry_data.id = self.__new_id(existing_j_id)
-        j_date: date = date.today() - timedelta(days=journal_entry_data.days)
+        date: dt.date \
+            = dt.date.today() - dt.timedelta(days=journal_entry_data.days)
         self.__journal_entries.append(
             {"id": journal_entry_data.id,
-             "date": j_date,
-             "no": self.__next_j_no(j_date),
+             "date": date,
+             "no": self.__next_j_no(date),
              "note": journal_entry_data.note,
              "created_by_id": self.__current_user_id,
              "updated_by_id": self.__current_user_id})
@@ -257,7 +258,7 @@ class BaseTestData(ABC):
                 assert account is not None
                 debit_no = debit_no + 1
                 line_item.id = self.__new_id(existing_l_id)
-                data: dict[str, t.Any] \
+                data: dict[str, Any] \
                     = {"id": line_item.id,
                        "journal_entry_id": journal_entry_data.id,
                        "is_debit": True,
@@ -276,7 +277,7 @@ class BaseTestData(ABC):
                 assert account is not None
                 credit_no = credit_no + 1
                 line_item.id = self.__new_id(existing_l_id)
-                data: dict[str, t.Any] \
+                data: dict[str, Any] \
                     = {"id": line_item.id,
                        "journal_entry_id": journal_entry_data.id,
                        "is_debit": False,
@@ -303,14 +304,14 @@ class BaseTestData(ABC):
                 existing_id.add(obj_id)
                 return obj_id
 
-    def __next_j_no(self, j_date: date) -> int:
+    def __next_j_no(self, date: dt.date) -> int:
         """Returns the next journal entry number in a day.
 
-        :param j_date: The journal entry date.
+        :param date: The journal entry date.
         :return: The next journal entry number.
         """
         existing: set[int] = {x["no"] for x in self.__journal_entries
-                              if x["date"] == j_date}
+                              if x["date"] == date}
         return 1 if len(existing) == 0 else max(existing) + 1
 
     def _add_simple_journal_entry(

tests/test_site/reset.py

@@ -17,7 +17,7 @@
 """The data reset for the Mia! Accounting demonstration website.
 
 """
-from datetime import date, timedelta
+import datetime as dt
 
 from flask import Flask, Blueprint, url_for, flash, redirect, session, \
     render_template, current_app
@@ -116,15 +116,15 @@ class SampleData(BaseTestData):
 
         :return: None.
         """
-        today: date = date.today()
+        today: dt.date = dt.date.today()
         days: int
         year: int
         month: int
 
         # Recurring in USD
-        j_date: date = date(today.year - 5, today.month, today.day)
-        j_date = j_date + timedelta(days=(4 - j_date.weekday()))
-        days = (today - j_date).days
+        date: dt.date = dt.date(today.year - 5, today.month, today.day)
+        date = date + dt.timedelta(days=(4 - date.weekday()))
+        days = (today - date).days
         while True:
             if days < 0:
                 break
@@ -147,7 +147,7 @@ class SampleData(BaseTestData):
             if month > 12:
                 year = year + 1
                 month = 1
-            days = (today - date(year, month, 1)).days
+            days = (today - dt.date(year, month, 1)).days
             if days < 0:
                 break
             self.__add_journal_entry(
@@ -159,12 +159,12 @@ class SampleData(BaseTestData):
 
         :return: None.
         """
-        today: date = date.today()
+        today: dt.date = dt.date.today()
 
         year: int = today.year - 5
         month: int = today.month
         while True:
-            days: int = (today - date(year, month, 5)).days
+            days: int = (today - dt.date(year, month, 5)).days
             if days < 0:
                 break
             self.__add_journal_entry(

tests/testlib.py

@@ -20,7 +20,7 @@
 from __future__ import annotations
 
 import re
-import typing as t
+from typing import Literal
 
 import httpx
 from flask import Flask, render_template_string
@@ -108,7 +108,7 @@ def get_client(app: Flask, username: str) -> tuple[httpx.Client, str]:
 
 
 def set_locale(client: httpx.Client, csrf_token: str,
-               locale: t.Literal["en", "zh_Hant", "zh_Hans"]) -> None:
+               locale: Literal["en", "zh_Hant", "zh_Hans"]) -> None:
     """Sets the current locale.
 
     :param client: The test client.

tests/testlib_journal_entry.py

@@ -17,8 +17,8 @@
 """The common test libraries for the journal entry test cases.
 
 """
+import datetime as dt
 import re
-from datetime import date
 from decimal import Decimal
 from secrets import randbelow
 
@@ -41,7 +41,7 @@ def get_add_form(csrf_token: str) -> dict[str, str]:
     """
     return {"csrf_token": csrf_token,
             "next": NEXT_URI,
-            "date": date.today().isoformat(),
+            "date": dt.date.today().isoformat(),
             "currency-0-code": "USD",
             "currency-0-debit-0-no": "16",
             "currency-0-debit-0-account_code": Accounts.CASH,