.readthedocs.yaml

@@ -38,4 +38,3 @@ python:
    install:
    - method: pip
      path: .
-   - requirements: docs/requirements.txt

README.rst

@@ -44,22 +44,130 @@ You may also download from the `PyPI project page`_ or the
 `release page`_ on the `Git repository`_.
 
 
+Prerequisites
+=============
+
+You need a running Flask application with database user login.
+The primary key of the user data model must be integer.  You also
+need at least one user.
+
+The following front-end JavaScript libraries must be loaded.  You may
+download it locally or use CDN_.
+
+* Bootstrap_ 5.2.3 or above
+* FontAwesome_ 6.2.1 or above
+* `Decimal.js`_ 6.4.3 or above
+* `Tempus-Dominus`_ 6.4.3 or above
+
+
+Configuration
+=============
+
+You need to pass the Flask *app* and an implementation of
+`UserUtilityInterface`_ to the `init_app`_ function.
+``UserUtilityInterface`` contains everything *Mia! Accounting* needs.
+
+The following is an example configuration for *Mia! Accounting*.
+
+::
+
+    from flask import Response, redirect
+    from .auth import current_user()
+    from .modules import User
+
+    def create_app(test_config=None) -> Flask:
+        app: Flask = Flask(__name__)
+
+        ... (Configuration of SQLAlchemy, CSRF, Babel_JS, ... etc) ...
+
+        import accounting
+
+        class UserUtils(accounting.UserUtilityInterface[User]):
+
+            def can_view(self) -> bool:
+                return True
+
+            def can_edit(self) -> bool:
+                return "editor" in current_user().roles
+
+            def can_admin(self) -> bool:
+                return current_user().is_admin
+
+            def unauthorized(self) -> Response:
+                return redirect("/login")
+
+            @property
+            def cls(self) -> t.Type[User]:
+                return User
+
+            @property
+            def pk_column(self) -> Column:
+                return User.id
+
+            @property
+            def current_user(self) -> User | None:
+                return current_user()
+
+            def get_by_username(self, username: str) -> User | None:
+                return User.query.filter(User.username == username).first()
+
+            def get_pk(self, user: User) -> int:
+                return user.id
+
+        accounting.init_app(app, UserUtils())
+
+        ... (Any other configuration) ...
+
+        return app
+
+
+Database Initialization
+=======================
+
+After the configuration, run the ``accounting-init-db`` console
+command to initialize the accounting database.  You need to specify
+the username of a user as the data creator.
+
+::
+
+    % flask --app myapp accounting-init-db -u username
+
+
+Navigation Menu
+===============
+
+Include the navigation menu in the `Bootstrap navigation bar`_ in your
+base template:
+
+::
+
+    <nav class="navbar navbar-expand-lg bg-body-tertiary bg-dark navbar-dark">
+      <div class="container-fluid">
+        ...
+        <div id="collapsible-navbar" class="collapse navbar-collapse">
+          <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+            ...
+            {% include "accounting/include/nav.html" %}
+            ...
+          </ul>
+          ...
+        </div>
+      </div>
+    </nav>
+
+Check your Flask application and see how it works.
+
+
 Documentation
 =============
 
 Refer to the `documentation on Read the Docs`_.
 
 
-Change Log
-==========
-
-Refer to the `change log`_.
-
-
 Copyright
 =========
 
- Copyright (c) 2023-2024 imacat.
+ Copyright (c) 2023 imacat.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -90,5 +198,12 @@ Authors
 .. _PyPI project page: https://pypi.org/project/mia-accounting
 .. _release page: https://github.com/imacat/mia-accounting/releases
 .. _Git repository: https://github.com/imacat/mia-accounting
+.. _CDN: https://en.wikipedia.org/wiki/Content_delivery_network
+.. _Bootstrap: https://getbootstrap.com
+.. _FontAwesome: https://fontawesome.com
+.. _Decimal.js: https://mikemcl.github.io/decimal.js
+.. _Tempus-Dominus: https://getdatepicker.com
+.. _UserUtilityInterface: https://mia-accounting.readthedocs.io/en/latest/accounting.utils.html#accounting.utils.user.UserUtilityInterface
+.. _init_app: https://mia-accounting.readthedocs.io/en/latest/accounting.html#accounting.init_app
+.. _Bootstrap navigation bar: https://getbootstrap.com/docs/5.3/components/navbar/
 .. _documentation on Read the Docs: https://mia-accounting.readthedocs.io
-.. _change log: https://mia-accounting.readthedocs.io/en/latest/changelog.html

docs/requirements.txt

@@ -1 +0,0 @@
-sphinx_rtd_theme

docs/source/accounting.report.reports.rst

@@ -76,22 +76,6 @@ accounting.report.reports.unapplied\_accounts module
    :undoc-members:
    :show-inheritance:
 
-accounting.report.reports.unmatched module
-------------------------------------------
-
-.. automodule:: accounting.report.reports.unmatched
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-accounting.report.reports.unmatched\_accounts module
-----------------------------------------------------
-
-.. automodule:: accounting.report.reports.unmatched_accounts
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/source/accounting.report.utils.rst

@@ -28,14 +28,6 @@ accounting.report.utils.csv\_export module
    :undoc-members:
    :show-inheritance:
 
-accounting.report.utils.offset\_matcher module
-----------------------------------------------
-
-.. automodule:: accounting.report.utils.offset_matcher
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 accounting.report.utils.option\_link module
 -------------------------------------------
 
@@ -68,14 +60,6 @@ accounting.report.utils.unapplied module
    :undoc-members:
    :show-inheritance:
 
-accounting.report.utils.unmatched module
-----------------------------------------
-
-.. automodule:: accounting.report.utils.unmatched
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 accounting.report.utils.urls module
 -----------------------------------
 

docs/source/accounting.rst

@@ -13,6 +13,7 @@ Subpackages
    accounting.journal_entry
    accounting.option
    accounting.report
+   accounting.unmatched_offset
    accounting.utils
 
 Submodules

docs/source/accounting.unmatched_offset.rst

@@ -0,0 +1,29 @@
+accounting.unmatched\_offset package
+====================================
+
+Submodules
+----------
+
+accounting.unmatched\_offset.queries module
+-------------------------------------------
+
+.. automodule:: accounting.unmatched_offset.queries
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+accounting.unmatched\_offset.views module
+-----------------------------------------
+
+.. automodule:: accounting.unmatched_offset.views
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: accounting.unmatched_offset
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/accounting.utils.rst

@@ -52,6 +52,14 @@ accounting.utils.offset\_alias module
    :undoc-members:
    :show-inheritance:
 
+accounting.utils.offset\_matcher module
+---------------------------------------
+
+.. automodule:: accounting.utils.offset_matcher
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 accounting.utils.options module
 -------------------------------
 
@@ -100,10 +108,10 @@ accounting.utils.strip\_text module
    :undoc-members:
    :show-inheritance:
 
-accounting.utils.title\_case module
+accounting.utils.unapplied module
------------------------------------
+---------------------------------
 
-.. automodule:: accounting.utils.title_case
+.. automodule:: accounting.utils.unapplied
    :members:
    :undoc-members:
    :show-inheritance:

docs/source/changelog.rst

@@ -1,455 +0,0 @@
-Change Log
-==========
-
-
-Version 1.6.0
---------------
-
-Released 2024/6/4
-
-* Updated Python version to 3.12.
-* Revised the calculation of "today" to use the client's timezone instead of
-  the server's timezone.
-* Updated the Bootstrap, FontAwesome, and Tempus-Dominus versions in the test
-  site.
-
-
-Version 1.5.11
---------------
-
-Released 2023/12/26
-
-Bug fix.
-
-* Refined to enable the selection of the 3351-001 Accumulated Profit or Loss
-  account.
-
-
-Version 1.5.10
---------------
-
-Released 2023/11/28
-
-Bug fix.
-
-* Fixed the form validator to enable the selection of Accumulated Profit or
-  Loss accounts other than 3351-001.
-
-
-Version 1.5.9
--------------
-
-Released 2023/11/28
-
-Bug fix.
-
-* Refined to enable the selection of Accumulated Profit or Loss accounts other
-  than 3351-001, facilitating the consolidation of existing balances.
-
-
-Version 1.5.8
--------------
-
-Released 2023/10/24
-
-Bug fix.
-
-* Fixed an icon in the detail of the cash receipt journal entry.
-
-Released at Jaipur, India on vacation.
-
-
-Version 1.5.7
--------------
-
-Released 2023/7/29
-
-Revised account title capitalization to capitalize account titles
-upon initialization of base accounts, rather than when displaying
-the accounts.  This prevents the system from incorrectly
-capitalizing titles of user-added accounts.
-
-For existing installation, run the ``accounting-titleize`` console
-command to capitalize the existing account titles that were already
-initialized.
-
-Other fixes:
-
-* Added missing documentation to the global variables, class
-  properties, and object properties.
-* Various minor fixes.
-
-
-Version 1.5.6
--------------
-
-Released 2023/5/23
-
-Bug fixes.
-
-* Fixed the return URI of the creation forms to decode the next URI.
-* Fixed the unmatched offset list to use the encoded next URI.
-
-
-Version 1.5.5
--------------
-
-Released 2023/5/23
-
-Security fixes.
-
-* Revised the next URI utilities to encode and decode the next URI
-  preventing tampering with the next URI.
-* Added the integrity value of the CDN stylesheet links.
-* Various fixes.
-
-
-Version 1.5.4
--------------
-
-Released 2023/5/18
-
-Security fixes.
-
-* Added safeguard to the next URI utilities, to prevent Cross-Site
-  Scripting (XSS) attacks.
-* Applied the safe next URI utilities to the test site.
-* Added the ``SameSite`` and ``Secure`` flags to the session cookie
-  of the test site.
-
-
-Version 1.5.3
--------------
-
-Released 2023/4/30
-
-* Fixed the error of the net balance in the unmatched offset list.
-* Revised the original line item editor not to override the existing
-  amount when the existing amount is less or equal to the net
-  balance.
-
-
-Version 1.5.2
--------------
-
-Released 2023/4/30
-
-* Fixed the error of the net balance in the unmatched offset list.
-
-
-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
--------------
-
-Released 2023/4/23
-
-* Updated to require ``SQLAlchemy >= 2``.
-* Added the change log.
-* Added the ``VERSION`` constant to the ``accounting`` module for
-  the package version, and revised ``pyproject.toml`` and ``conf.py``
-  to read the version from it.
-
-
-Version 1.4.1
--------------
-
-Released 2023/4/22
-
-* Updated to allow editing the description of the journal entry line
-  item with offsets or are offsetting to original line items.
-* Updated not to override the existing description of a journal entry
-  line item after choosing the original line item to offset to.
-
-
-Version 1.4.0
--------------
-
-Released 2023/4/18
-
-* Rewrote the unapplied original line items and unmatched offsets.
-
-  * The unapplied original line items and unmatched offsets are both
-    in the report submodule.  They can be filtered with currency and
-    period now.
-  * Show the unapplied original line items and unmatched offsets
-    together, and added the accumulated balance in the unmatched
-    offset list, for ease of reference.
-
-* Removed the account code from the journal entry detail and journal
-  entry form for mobile devices.
-* Made the account options in the reports to be scrollable.
-
-
-Version 1.3.3
--------------
-
-Released 2023/4/13
-
-Changed the sample data generation in the test site live demonstration
-from pre-recorded data to real-time generation, to avoid the problem
-with the start of months and weeks changed with the date of the
-import.
-
-
-Version 1.3.2
--------------
-
-Released 2023/4/12
-
-Added the sample data generation and database reset on the test site
-for live demonstration.
-
-
-Version 1.3.1
--------------
-
-Released 2023/4/11
-
-* Fixed the permission of the navigation menu of the unmatched offsets.
-* Revised the test site to be more accessible as the live demonstration.
-
-
-Version 1.3.0
--------------
-
-Released 2023/4/11
-
-Added the ``accounting-init-db`` console command to replace all the
-other console commands to initialize the accounting database.  The
-test site does not work with previous versions (<1.3.0).
-
-
-Version 1.2.1
--------------
-
-Released 2023/4/9
-
-Fixed the search result to allow full ``year/month/day``
-specification.
-
-
-Version 1.2.0
--------------
-
-Released 2023/4/9
-
-* Simplified the URL of the default reports.
-* Fixed the crash with malformed Chinese translation.
-* Fixed the crash when downloading CSV data with non-US-ASCII
-  filenames.
-
-
-Version 1.1.0
--------------
-
-Released 2023/4/9
-
-* Added the unapplied original line item list, to track unpaid
-  payables, unreceived receivables, assets, prepaids, refundable
-  deposits, etc.
-* Added the offset matcher to match unapplied original line items
-  with unmatched offsets.
-
-
-Version 1.0.1
--------------
-
-Released 2023/4/6
-
-Documentation fixes.
-
-
-Version 1.0.0
--------------
-
-Released 2023/4/6
-
-The first formal release in Flask.
-
-Added the documentation.
-
-
-Version 0.11.1 (Pre-release)
-----------------------------
-
-Released 2023/4/5
-
-Removed the zero balances from the trial balance, the income
-statement, and the balance sheet.
-
-
-Version 0.11.0 (Pre-release)
-----------------------------
-
-Released 2023/4/5
-
-* Renamed the project from ``mia-accounting-flask`` to
-  ``mia-accounting``.
-* Updated the URL of the reports, as the default views of the
-  accounting application.
-* Updated ``README``.
-* Various fixes.
-
-
-Version 0.10.0 (Pre-release)
-----------------------------
-
-Released 2023/4/3
-
-* Added the unauthorized method to the ``UserUtilityInterface``
-  interface to allow fine control to how to handle the case when the
-  user has not logged in.
-* Revised the JavaScript description editor to respect the account
-  that the user has confirmed or specifically selected.
-* Various fixes.
-
-
-Version 0.9.1 (Pre-release)
----------------------------
-
-Released 2023/3/24
-
-* A distinguishable look in the option detail than the option form.
-* A better look in the new journal entry forms when there is no line
-  item yet.
-* Fixed the search in the original entry selector in the journal
-  entry form to always do a partial match, to fix the problem that
-  there is no match when typing is not finished yet.
-* Fixed the search in the original entry selector to search the net
-  balance correctly.
-* Replaced the ``editor`` and ``editor2`` accounts with the ``admin``
-  and ``editor`` accounts.
-* Various fixes.
-
-
-Version 0.9.0 (Pre-release)
----------------------------
-
-Released 2023/3/23
-
-Moved the settings from the ``.env`` file to the option table in the
-database that can be set and updated on the web interface.  Added the
-settings page to show and update the settings.
-
-
-Version 0.8.0 (Pre-release)
----------------------------
-
-Released 2023/3/22
-
-* Added the recurring transactions to the description editor.
-* Added prevention to delete database objects that are essential or
-  referenced by others with foreign keys.
-* Various fixes on the visual layout.
-
-
-Version 0.7.0 (Pre-release)
----------------------------
-
-Released 2023/3/21
-
-* Renamed "transaction" to "journal entry", and "journal entry" to
-  "journal entry line item".
-* Renamed ``summary`` to ``description``.
-* Updated tempus-dominus from version 6.2.10 to 6.4.3.
-* Fixed titles and capitalization.
-* Fixed to search case-insensitively.
-* Added favicon to the test site.
-* Fixed the navigation menu when there is no matching endpoint.
-* Various fixes.
-
-
-Version 0.6.0 (Pre-release)
----------------------------
-
-Released 2023/3/18
-
-* Added offset tracking to the journal entries in the payable and
-  receivable accounts.
-* Renamed the ``is_offset_needed`` column to ``is_need_offset`` in
-  the ``Account`` data model.
-
-
-Version 0.5.0 (Pre-release)
----------------------------
-
-Released 2023/3/10
-
-Added the accounting reports.
-
-
-Version 0.4.0 (Pre-release)
----------------------------
-
-Released 2023/3/1
-
-Added the transaction summary helper.
-
-
-Version 0.3.1 (Pre-release)
----------------------------
-
-Released 2023/2/28
-
-* Fixed the error that cannot select any account when adding new
-  transactions.
-* Fixed the database error when adding new transactions.
-* Added the button to convert a cash income or cash expense
-  transaction to a transfer transaction.
-
-
-Version 0.3.0 (Pre-release)
----------------------------
-
-Released 2023/2/27
-
-Added the transaction management.
-
-
-Version 0.2.0 (Pre-release)
----------------------------
-
-Released 2023/2/7
-
-* Added the currency management.
-* Changed the ``can_edit`` permission to at least require the user to
-  log in first.
-* Changed the type hint of the ``current_user`` pseudo property of
-  the ``AbstractUserUtils`` class to return ``None`` when the user
-  has not logged in.
-
-
-Version 0.1.1 (Pre-release)
----------------------------
-
-Released 2023/2/3
-
-Finalized the account management, with tests and reordering.
-
-
-Version 0.1.0 (Pre-release)
----------------------------
-
-Released 2023/2/3
-
-Added the account management, and updated the API to initialize the
-accounting application.
-
-
-Version 0.0.0 (Pre-release)
----------------------------
-
-Released 2023/2/3
-
-Initial release with main account list, localization, pagination,
-query, permission, Sphinx documentation, and a test case based on a
-test demonstration site.

docs/source/conf.py

@@ -6,7 +6,6 @@ import os
 import sys
 
 sys.path.insert(0, os.path.abspath('../../src/'))
-import accounting
 
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
@@ -14,7 +13,7 @@ import accounting
 project = 'Mia! Accounting'
 copyright = '2023, imacat'
 author = 'imacat'
-release = accounting.VERSION
+release = '1.3.2'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/source/index.rst

@@ -14,7 +14,6 @@ Welcome to Mia! Accounting's documentation!
    accounting
    examples
    history
-   changelog
 
 
 

docs/source/intro.rst

@@ -50,9 +50,9 @@ The following front-end JavaScript libraries must be loaded.  You may
 download it locally or use CDN_.
 
 * Bootstrap_ 5.2.3 or above
-* FontAwesome_ 6.4.0 or above
+* FontAwesome_ 6.2.1 or above
-* `decimal.js`_ 10.4.3 or above, or `decimal.js-light`_ 2.5.1 or above.
+* `Decimal.js`_ 6.4.3 or above
-* `Tempus-Dominus`_ 6.7.7 or above
+* `Tempus-Dominus`_ 6.4.3 or above
 
 
 Configuration
@@ -103,6 +103,12 @@ base template:
 Check your Flask application and see how it works.
 
 
+Documentation
+-------------
+
+Refer to the `documentation on Read the Docs`_.
+
+
 .. _Flask: https://flask.palletsprojects.com
 .. _double-entry bookkeeping: https://en.wikipedia.org/wiki/Double-entry_bookkeeping
 .. _live demonstration: https://accounting.imacat.idv.tw
@@ -114,7 +120,7 @@ Check your Flask application and see how it works.
 .. _CDN: https://en.wikipedia.org/wiki/Content_delivery_network
 .. _Bootstrap: https://getbootstrap.com
 .. _FontAwesome: https://fontawesome.com
-.. _decimal.js: https://mikemcl.github.io/decimal.js
+.. _Decimal.js: https://mikemcl.github.io/decimal.js
-.. _decimal.js-light: https://mikemcl.github.io/decimal.js-light
 .. _Tempus-Dominus: https://getdatepicker.com
 .. _Bootstrap navigation bar: https://getbootstrap.com/docs/5.3/components/navbar/
+.. _documentation on Read the Docs: https://mia-accounting.readthedocs.io

pyproject.toml

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2022/8/21
 
-#  Copyright (c) 2022-2024 imacat.
+#  Copyright (c) 2022-2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 
 [project]
 name = "mia-accounting"
-dynamic = ["version"]
+version = "1.3.2"
 description = "A Flask accounting module."
 readme = "README.rst"
-requires-python = ">=3.12"
+requires-python = ">=3.11"
 authors = [
     {name = "imacat", email = "imacat@mail.imacat.idv.tw"},
 ]
@@ -33,8 +33,7 @@ classifiers = [
     "Topic :: Office/Business :: Financial :: Accounting",
 ]
 dependencies = [
-    "Flask",
+    "flask",
-    "SQLAlchemy >= 2",
     "Flask-SQLAlchemy",
     "Flask-WTF",
     "Flask-Babel >= 3",
@@ -42,14 +41,14 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-devel = [
+test = [
+    "unittest",
     "httpx",
     "OpenCC",
 ]
 
 [project.urls]
 "Documentation" = "https://mia-accounting.readthedocs.io"
-"Change Log" = "https://mia-accounting.readthedocs.io/en/latest/changelog.html"
 "Repository" = "https://github.com/imacat/mia-accounting"
 "Bug Tracker" = "https://github.com/imacat/mia-accounting/issues"
 "Demonstration" = "https://accounting.imacat.idv.tw"
@@ -58,9 +57,6 @@ devel = [
 requires = ["setuptools>=42"]
 build-backend = "setuptools.build_meta"
 
-[tool.setuptools.dynamic]
-version = {attr = "accounting.VERSION"}
-
 [tool.setuptools.exclude-package-data]
 "*" = [
     "babel.cfg",

src/accounting/__init__.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/1/25
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@ from flask_sqlalchemy import SQLAlchemy
 
 from accounting.utils.user import UserUtilityInterface
 
-VERSION: str = "1.6.0"
-"""The package version."""
 db: SQLAlchemy = SQLAlchemy()
 """The database instance."""
 data_dir: Path = Path(__file__).parent / "data"
@@ -63,9 +61,8 @@ def init_app(app: Flask, user_utils: UserUtilityInterface,
     bp.add_app_template_global(default_currency_code,
                                "accounting_default_currency_code")
 
-    from .commands import init_db_command, titleize_command
+    from .commands import init_db_command
     app.cli.add_command(init_db_command)
-    app.cli.add_command(titleize_command)
 
     from . import locale
     locale.init_app(app, bp)
@@ -94,4 +91,7 @@ def init_app(app: Flask, user_utils: UserUtilityInterface,
     from . import option
     option.init_app(bp)
 
+    from . import unmatched_offset
+    unmatched_offset.init_app(bp)
+
     app.register_blueprint(bp, url_prefix=url_prefix)

src/accounting/account/commands.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/1/30
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,17 +17,17 @@
 """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
 
-type AccountData = tuple[int, str, int, str, str, str, bool]
+AccountData = tuple[int, str, int, str, str, str, bool]
 """The format of the account data, as a list of (ID, base account code, number,
 English, Traditional Chinese, Simplified Chinese, is-need-offset) tuples."""
 
@@ -63,8 +63,8 @@ def init_accounts_command(username: str) -> None:
                 existing_id.add(new_id)
                 return new_id
 
-    data: list[dict[str, Any]] = []
+    data: list[dict[str, t.Any]] = []
-    l10n_data: list[dict[str, Any]] = []
+    l10n_data: list[dict[str, t.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/account/forms.py

@@ -168,9 +168,7 @@ class AccountReorderForm:
         :param base: The base account.
         """
         self.base: BaseAccount = base
-        """The base account."""
         self.is_modified: bool = False
-        """Whether the order is modified."""
 
     def save_order(self) -> None:
         """Saves the order of the account.

src/accounting/base_account/commands.py

@@ -24,7 +24,6 @@ import sqlalchemy as sa
 from accounting import data_dir
 from accounting import db
 from accounting.models import BaseAccount, BaseAccountL10n
-from accounting.utils.title_case import title_case
 
 
 def init_base_accounts_command() -> None:
@@ -35,7 +34,7 @@ def init_base_accounts_command() -> None:
     with open(data_dir / "base_accounts.csv") as fp:
         data: list[dict[str, str]] = [x for x in csv.DictReader(fp)]
     account_data: list[dict[str, str]] = [{"code": x["code"],
-                                           "title_l10n": title_case(x["title"])}
+                                           "title_l10n": x["title"]}
                                           for x in data]
     locales: list[str] = [x[5:] for x in data[0] if x.startswith("l10n-")]
     l10n_data: list[dict[str, str]] = [{"account_code": x["code"],

src/accounting/commands.py

@@ -26,10 +26,7 @@ from accounting import db
 from accounting.account import init_accounts_command
 from accounting.base_account import init_base_accounts_command
 from accounting.currency import init_currencies_command
-from accounting.models import BaseAccount, Account
+from accounting.utils.user import has_user
-from accounting.utils.title_case import title_case
-from accounting.utils.user import has_user, get_user_pk
-import sqlalchemy as sa
 
 
 def __validate_username(ctx: click.core.Context, param: click.core.Option,
@@ -63,32 +60,3 @@ def init_db_command(username: str) -> None:
     init_currencies_command(username)
     db.session.commit()
     click.echo("Accounting database initialized.")
-
-
-@click.command("accounting-titleize")
-@click.option("-u", "--username", metavar="USERNAME", prompt=True,
-              help="The username.", callback=__validate_username,
-              default=lambda: os.getlogin())
-@with_appcontext
-def titleize_command(username: str) -> None:
-    """Capitalize the account titles."""
-    updater_pk: int = get_user_pk(username)
-    updated: int = 0
-    for base in BaseAccount.query:
-        new_title: str = title_case(base.title_l10n)
-        if base.title_l10n != new_title:
-            base.title_l10n = new_title
-            updated = updated + 1
-    for account in Account.query:
-        if account.title_l10n.lower() == account.base.title_l10n.lower():
-            new_title: str = title_case(account.title_l10n)
-            if account.title_l10n != new_title:
-                account.title_l10n = new_title
-                account.updated_at = sa.func.now()
-                account.updated_by_id = updater_pk
-                updated = updated + 1
-    if updated == 0:
-        click.echo("All account titles were already capitalized.")
-        return
-    db.session.commit()
-    click.echo(f"{updated} account titles capitalized.")

src/accounting/currency/commands.py

@@ -18,7 +18,7 @@
 
 """
 import csv
-from typing import Any
+import typing as t
 
 import sqlalchemy as sa
 
@@ -39,11 +39,11 @@ def init_currencies_command(username: str) -> None:
         return
 
     creator_pk: int = get_user_pk(username)
-    currency_data: list[dict[str, Any]] = [{"code": x["code"],
+    currency_data: list[dict[str, t.Any]] = [{"code": x["code"],
-                                            "name_l10n": x["name"],
+                                              "name_l10n": x["name"],
-                                            "created_by_id": creator_pk,
+                                              "created_by_id": creator_pk,
-                                            "updated_by_id": creator_pk}
+                                              "updated_by_id": creator_pk}
-                                           for x in to_add]
+                                             for x in to_add]
     locales: list[str] = [x[5:] for x in to_add[0] if x.startswith("l10n-")]
     l10n_data: list[dict[str, str]] = [{"currency_code": x["code"],
                                         "locale": y,

src/accounting/forms.py

@@ -65,12 +65,12 @@ class IsDebitAccount:
         :param message: The error message.
         """
         self.__message: str | LazyString = message
-        """The error message."""
 
     def __call__(self, form: FlaskForm, field: StringField) -> None:
         if field.data is None:
             return
         if re.match(r"^(?:[1235689]|7[5678])", field.data) \
+                and not field.data.startswith("3351-") \
                 and not field.data.startswith("3353-"):
             return
         raise ValidationError(self.__message)
@@ -85,12 +85,12 @@ class IsCreditAccount:
         :param message: The error message.
         """
         self.__message: str | LazyString = message
-        """The error message."""
 
     def __call__(self, form: FlaskForm, field: StringField) -> None:
         if field.data is None:
             return
         if re.match(r"^(?:[123489]|7[1234])", field.data) \
+                and not field.data.startswith("3351-") \
                 and not field.data.startswith("3353-"):
             return
         raise ValidationError(self.__message)

src/accounting/journal_entry/converters.py

@@ -17,7 +17,7 @@
 """The path converters for the journal entry management.
 
 """
-import datetime as dt
+from datetime import date
 
 from flask import abort
 from werkzeug.routing import BaseConverter
@@ -37,8 +37,7 @@ class JournalEntryConverter(BaseConverter):
         :param value: The journal entry ID.
         :return: The corresponding journal entry.
         """
-        journal_entry: JournalEntry | None \
+        journal_entry: JournalEntry | None = db.session.get(JournalEntry, value)
-            = db.session.get(JournalEntry, value)
         if journal_entry is None:
             abort(404)
         return journal_entry
@@ -82,18 +81,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) -> dt.date:
+    def to_python(self, value: str) -> date:
         """Converts an ISO date to a date.
 
         :param value: The ISO date.
         :return: The corresponding date.
         """
         try:
-            return dt.date.fromisoformat(value)
+            return date.fromisoformat(value)
         except ValueError:
             abort(404)
 
-    def to_url(self, value: dt.date) -> str:
+    def to_url(self, value: date) -> str:
         """Converts a date to its ISO date.
 
         :param value: The date.

src/accounting/journal_entry/forms/currency.py

@@ -30,6 +30,7 @@ from accounting import db
 from accounting.forms import CurrencyExists
 from accounting.locale import lazy_gettext
 from accounting.models import JournalEntryLineItem
+from accounting.utils.cast import be
 from accounting.utils.offset_alias import offset_alias
 from accounting.utils.strip_text import strip_text
 from .line_item import LineItemForm, CreditLineItemForm, DebitLineItemForm
@@ -74,8 +75,8 @@ class KeepCurrencyWhenHavingOffset:
         offset: sa.Alias = offset_alias()
         original_line_items: list[JournalEntryLineItem]\
             = JournalEntryLineItem.query\
-            .join(offset,
+            .join(offset, be(JournalEntryLineItem.id
-                  JournalEntryLineItem.id == offset.c.original_line_item_id,
+                             == offset.c.original_line_item_id),
                   isouter=True)\
             .filter(JournalEntryLineItem.id
                     .in_({x.id.data for x in form.line_items

src/accounting/journal_entry/forms/journal_entry.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/2/18
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 
 """
 import datetime as dt
+import typing as t
 from abc import ABC, abstractmethod
-from typing import 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: Type[LineItemCollector] = LineItemCollector
+        self.collector: t.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."""
@@ -151,10 +151,11 @@ class JournalEntryForm(FlaskForm):
         is_new: bool = obj.id is None
         if is_new:
             obj.id = new_id(JournalEntry)
+        self.date: DateField
         self.__set_date(obj, self.date.data)
         obj.note = self.note.data
 
-        collector_cls: Type[LineItemCollector] = self.collector
+        collector_cls: t.Type[LineItemCollector] = self.collector
         collector: collector_cls = collector_cls(self, obj)
         collector.collect()
 
@@ -308,7 +309,11 @@ class JournalEntryForm(FlaskForm):
         return db.session.scalar(select)
 
 
-class LineItemCollector[T: JournalEntryForm](ABC):
+T = t.TypeVar("T", bound=JournalEntryForm)
+"""A journal entry form variant."""
+
+
+class LineItemCollector(t.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.
 
 """
-import datetime as dt
+from datetime import date
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -33,6 +33,7 @@ from accounting.forms import ACCOUNT_REQUIRED, AccountExists, IsDebitAccount, \
 from accounting.locale import lazy_gettext
 from accounting.models import Account, JournalEntry, JournalEntryLineItem
 from accounting.template_filters import format_amount
+from accounting.utils.cast import be
 from accounting.utils.random_id import new_id
 from accounting.utils.strip_text import strip_text
 from accounting.utils.user import get_current_user_pk
@@ -197,13 +198,13 @@ class NotExceedingOriginalLineItemNetBalance:
             existing_line_item_id \
                 = {x.id for x in form.journal_entry_form.obj.line_items}
         offset_total_func: sa.Function = sa.func.sum(sa.case(
-            (JournalEntryLineItem.is_debit == is_debit,
+            (be(JournalEntryLineItem.is_debit == is_debit),
              JournalEntryLineItem.amount),
             else_=-JournalEntryLineItem.amount))
         offset_total_but_form: Decimal | None = db.session.scalar(
             sa.select(offset_total_func)
-            .filter(JournalEntryLineItem.original_line_item_id
+            .filter(be(JournalEntryLineItem.original_line_item_id
-                    == original_line_item.id,
+                       == original_line_item.id),
                     JournalEntryLineItem.id.not_in(existing_line_item_id)))
         if offset_total_but_form is None:
             offset_total_but_form = Decimal("0")
@@ -231,7 +232,8 @@ class NotLessThanOffsetTotal:
             (JournalEntryLineItem.is_debit != is_debit,
              JournalEntryLineItem.amount),
             else_=-JournalEntryLineItem.amount)))\
-            .filter(JournalEntryLineItem.original_line_item_id == form.id.data)
+            .filter(be(JournalEntryLineItem.original_line_item_id
+                       == form.id.data))
         offset_total: Decimal | None = db.session.scalar(select_offset_total)
         if offset_total is not None and field.data < offset_total:
             raise ValidationError(lazy_gettext(
@@ -265,19 +267,6 @@ class LineItemForm(FlaskForm):
         self.journal_entry_form: JournalEntryForm | None = None
         """The source journal entry form."""
 
-    @property
-    def account_title(self) -> str:
-        """Returns the title of the account.
-
-        :return: The title of the account.
-        """
-        if self.account_code.data is None:
-            return ""
-        account: Account | None = Account.find_by_code(self.account_code.data)
-        if account is None:
-            return ""
-        return account.title
-
     @property
     def account_text(self) -> str:
         """Returns the text representation of the account.
@@ -307,7 +296,7 @@ class LineItemForm(FlaskForm):
         return getattr(self, "____original_line_item")
 
     @property
-    def original_line_item_date(self) -> dt.date | None:
+    def original_line_item_date(self) -> 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.
 
 """
-import datetime as dt
+from datetime import date
 
 import sqlalchemy as sa
 from flask import request
@@ -26,15 +26,17 @@ from accounting import db
 from accounting.models import JournalEntry
 
 
-def sort_journal_entries_in(date: dt.date, exclude: int | None = None) -> None:
+def sort_journal_entries_in(journal_entry_date: date,
+                            exclude: int | None = None) -> None:
     """Sorts the journal entries under a date after changing the date or
     deleting a journal entry.
 
-    :param date: The date of the journal entry.
+    :param journal_entry_date: The date of the journal entry.
     :param exclude: The journal entry ID to exclude.
     :return: None.
     """
-    conditions: list[sa.BinaryExpression] = [JournalEntry.date == date]
+    conditions: list[sa.BinaryExpression] \
+        = [JournalEntry.date == journal_entry_date]
     if exclude is not None:
         conditions.append(JournalEntry.id != exclude)
     journal_entries: list[JournalEntry] = JournalEntry.query\
@@ -48,15 +50,13 @@ def sort_journal_entries_in(date: dt.date, exclude: int | None = None) -> None:
 class JournalEntryReorderForm:
     """The form to reorder the journal entries."""
 
-    def __init__(self, date: dt.date):
+    def __init__(self, journal_entry_date: date):
         """Constructs the form to reorder the journal entries in a day.
 
-        :param date: The date.
+        :param journal_entry_date: The date.
         """
-        self.date: dt.date = date
+        self.date: date = journal_entry_date
-        """The date."""
         self.is_modified: bool = False
-        """Whether the order is modified."""
 
     def save_order(self) -> None:
         """Saves the order of the account.

src/accounting/journal_entry/utils/account_option.py

@@ -32,8 +32,6 @@ class AccountOption:
         """The account ID."""
         self.code: str = account.code
         """The account code."""
-        self.title: str = account.title
-        """The account title."""
         self.query_values: list[str] = account.query_values
         """The values to be queried."""
         self.__str: str = str(account)

src/accounting/journal_entry/utils/description_editor.py

@@ -18,7 +18,7 @@
 
 """
 import re
-from typing import Literal
+import typing as t
 
 import sqlalchemy as sa
 
@@ -54,14 +54,6 @@ class DescriptionAccount:
         """
         return str(self.__account)
 
-    @property
-    def title(self) -> str:
-        """Returns the account title.
-
-        :return: The account title.
-        """
-        return self.__account.title
-
     def add_freq(self, freq: int) -> None:
         """Adds the frequency of an account.
 
@@ -124,12 +116,12 @@ class DescriptionTag:
 class DescriptionType:
     """A description type"""
 
-    def __init__(self, type_id: Literal["general", "travel", "bus"]):
+    def __init__(self, type_id: t.Literal["general", "travel", "bus"]):
         """Constructs a description type.
 
         :param type_id: The type ID, either "general", "travel", or "bus".
         """
-        self.id: Literal["general", "travel", "bus"] = type_id
+        self.id: t.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."""
@@ -166,11 +158,8 @@ class DescriptionRecurring:
         :param account: The account.
         """
         self.name: str = name
-        """The name."""
         self.account: DescriptionAccount = DescriptionAccount(account, 0)
-        """The account."""
         self.description_template: str = description_template
-        """The description template."""
 
     @property
     def account_codes(self) -> list[str]:
@@ -184,12 +173,12 @@ class DescriptionRecurring:
 class DescriptionDebitCredit:
     """The description on debit or credit."""
 
-    def __init__(self, debit_credit: Literal["debit", "credit"]):
+    def __init__(self, debit_credit: t.Literal["debit", "credit"]):
         """Constructs the description on debit or credit.
 
         :param debit_credit: Either "debit" or "credit".
         """
-        self.debit_credit: Literal["debit", "credit"] = debit_credit
+        self.debit_credit: t.Literal["debit", "credit"] = debit_credit
         """Either debit or credit."""
         self.general: DescriptionType = DescriptionType("general")
         """The general tags."""
@@ -197,14 +186,14 @@ class DescriptionDebitCredit:
         """The travel tags."""
         self.bus: DescriptionType = DescriptionType("bus")
         """The bus tags."""
-        self.__type_dict: dict[Literal["general", "travel", "bus"],
+        self.__type_dict: dict[t.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: Literal["general", "travel", "bus"],
+    def add_tag(self, tag_type: t.Literal["general", "travel", "bus"],
                 name: str, account: Account, freq: int) -> None:
         """Adds a tag.
 
@@ -281,7 +270,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[Literal["debit", "credit"],
+        debit_credit_dict: dict[t.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) -> Type[JournalEntryForm]:
+    def form(self) -> t.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) -> Type[JournalEntryForm]:
+    def form(self) -> t.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) -> Type[JournalEntryForm]:
+    def form(self) -> t.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) -> Type[JournalEntryForm]:
+    def form(self) -> t.Type[JournalEntryForm]:
         """Returns the form class.
 
         :return: The form class.

src/accounting/journal_entry/utils/original_line_items.py

@@ -24,6 +24,7 @@ from sqlalchemy.orm import selectinload
 
 from accounting import db
 from accounting.models import Account, JournalEntry, JournalEntryLineItem
+from accounting.utils.cast import be
 from accounting.utils.offset_alias import offset_alias
 
 
@@ -44,7 +45,8 @@ def get_selectable_original_line_items(
     offset: sa.Alias = offset_alias()
     net_balance: sa.Label = (JournalEntryLineItem.amount + sa.func.sum(sa.case(
         (offset.c.id.in_(line_item_id_on_form), 0),
-        (offset.c.is_debit == JournalEntryLineItem.is_debit, offset.c.amount),
+        (be(offset.c.is_debit == JournalEntryLineItem.is_debit),
+         offset.c.amount),
         else_=-offset.c.amount))).label("net_balance")
     conditions: list[sa.BinaryExpression] = [Account.is_need_offset]
     sub_conditions: list[sa.BinaryExpression] = []
@@ -58,8 +60,8 @@ def get_selectable_original_line_items(
     select_net_balances: sa.Select \
         = sa.select(JournalEntryLineItem.id, net_balance)\
         .join(Account)\
-        .join(offset,
+        .join(offset, be(JournalEntryLineItem.id
-              JournalEntryLineItem.id == offset.c.original_line_item_id,
+                         == offset.c.original_line_item_id),
               isouter=True)\
         .filter(*conditions)\
         .group_by(JournalEntryLineItem.id)\

src/accounting/journal_entry/views.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/2/18
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 """The views for the journal entry management.
 
 """
-import datetime as dt
+from datetime import date
 from urllib.parse import parse_qsl, urlencode
 
 import sqlalchemy as sa
@@ -30,10 +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.timezone import get_tz_today
+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, \
@@ -68,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 = get_tz_today()
+        form.date.data = date.today()
     return journal_entry_op.render_create_template(form)
 
 
@@ -187,31 +186,31 @@ def delete_journal_entry(journal_entry: JournalEntry) -> redirect:
     return redirect(or_next(__get_default_page_uri()))
 
 
-@bp.get("dates/<date:date>", endpoint="order")
+@bp.get("dates/<date:journal_entry_date>", endpoint="order")
 @has_permission(can_view)
-def show_journal_entry_order(date: dt.date) -> str:
+def show_journal_entry_order(journal_entry_date: date) -> str:
     """Shows the order of the journal entries in a same date.
 
-    :param date: The date.
+    :param journal_entry_date: The date.
     :return: The order of the journal entries in the date.
     """
     journal_entries: list[JournalEntry] = JournalEntry.query \
-        .filter(JournalEntry.date == date) \
+        .filter(JournalEntry.date == journal_entry_date) \
         .order_by(JournalEntry.no).all()
     return render_template("accounting/journal-entry/order.html",
-                           date=date, list=journal_entries)
+                           date=journal_entry_date, list=journal_entries)
 
 
-@bp.post("dates/<date:date>", endpoint="sort")
+@bp.post("dates/<date:journal_entry_date>", endpoint="sort")
 @has_permission(can_edit)
-def sort_journal_entries(date: dt.date) -> redirect:
+def sort_journal_entries(journal_entry_date: date) -> redirect:
     """Reorders the journal entries in a date.
 
-    :param date: The date.
+    :param journal_entry_date: The date.
     :return: The redirection to the incoming account or the account list.  The
         reordering operation does not fail.
     """
-    form: JournalEntryReorderForm = JournalEntryReorderForm(date)
+    form: JournalEntryReorderForm = JournalEntryReorderForm(journal_entry_date)
     form.save_order()
     if not form.is_modified:
         flash(s(lazy_gettext("The order was not modified.")), "success")

src/accounting/locale.py

@@ -25,10 +25,8 @@ from flask_babel import LazyString, Domain
 from flask_babel_js import JAVASCRIPT, c2js
 
 translation_dir: Path = Path(__file__).parent / "translations"
-"""The directory of the translation files."""
 domain: Domain = Domain(translation_directories=[translation_dir],
                         domain="accounting")
-"""The message domain."""
 
 
 def gettext(string, **variables) -> str:
@@ -122,5 +120,6 @@ def init_app(app: Flask, bp: Blueprint) -> None:
     :param bp: The blueprint of the accounting application.
     :return: None.
     """
-    bp.add_url_rule("/_jstrans.js", "babel_catalog", __babel_js_catalog_view)
+    bp.add_url_rule("/_jstrans.js", "babel_catalog",
+                    __babel_js_catalog_view)
     app.jinja_env.globals["A_"] = domain.gettext

src/accounting/models.py

@@ -19,16 +19,14 @@
 """
 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
 from flask_babel import get_locale, get_babel
 from sqlalchemy import text
-from sqlalchemy.orm import Mapped, mapped_column
 
 from accounting import db
 from accounting.locale import gettext
@@ -39,14 +37,14 @@ class BaseAccount(db.Model):
     """A base account."""
     __tablename__ = "accounting_base_accounts"
     """The table name."""
-    code: Mapped[str] = mapped_column(primary_key=True)
+    code = db.Column(db.String, nullable=False, primary_key=True)
-    """The account code."""
+    """The code."""
-    title_l10n: Mapped[str] = mapped_column("title")
+    title_l10n = db.Column("title", db.String, nullable=False)
     """The title."""
-    l10n: Mapped[list[BaseAccountL10n]] \
+    l10n = db.relationship("BaseAccountL10n", back_populates="account",
-        = db.relationship(back_populates="account", lazy=False)
+                           lazy=False)
     """The localized titles."""
-    accounts: Mapped[list[Account]] = db.relationship(back_populates="base")
+    accounts = db.relationship("Account", back_populates="base")
     """The descendant accounts under the base account."""
 
     def __str__(self) -> str:
@@ -54,7 +52,7 @@ class BaseAccount(db.Model):
 
         :return: The string representation of the base account.
         """
-        return f"{self.code} {self.title}"
+        return f"{self.code} {self.title.title()}"
 
     @property
     def title(self) -> str:
@@ -83,16 +81,17 @@ class BaseAccountL10n(db.Model):
     """A localized base account title."""
     __tablename__ = "accounting_base_accounts_l10n"
     """The table name."""
-    account_code: Mapped[str] \
+    account_code = db.Column(db.String,
-        = mapped_column(db.ForeignKey(BaseAccount.code, onupdate="CASCADE",
+                             db.ForeignKey(BaseAccount.code,
-                                      ondelete="CASCADE"),
+                                           onupdate="CASCADE",
-                        primary_key=True)
+                                           ondelete="CASCADE"),
-    """The account code."""
+                             nullable=False, primary_key=True)
-    account: Mapped[BaseAccount] = db.relationship(back_populates="l10n")
+    """The code of the account."""
+    account = db.relationship(BaseAccount, back_populates="l10n")
     """The account."""
-    locale: Mapped[str] = mapped_column(primary_key=True)
+    locale = db.Column(db.String, nullable=False, primary_key=True)
     """The locale."""
-    title: Mapped[str]
+    title = db.Column(db.String, nullable=False)
     """The localized title."""
 
 
@@ -100,43 +99,47 @@ class Account(db.Model):
     """An account."""
     __tablename__ = "accounting_accounts"
     """The table name."""
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=False)
+    id = db.Column(db.Integer, nullable=False, primary_key=True,
+                   autoincrement=False)
     """The account ID."""
-    base_code: Mapped[str] \
+    base_code = db.Column(db.String,
-        = mapped_column(db.ForeignKey(BaseAccount.code, onupdate="CASCADE",
+                          db.ForeignKey(BaseAccount.code, onupdate="CASCADE",
-                                      ondelete="CASCADE"))
+                                        ondelete="CASCADE"),
+                          nullable=False)
     """The code of the base account."""
-    base: Mapped[BaseAccount] = db.relationship(back_populates="accounts")
+    base = db.relationship(BaseAccount, back_populates="accounts")
     """The base account."""
-    no: Mapped[int] = mapped_column(default=text("1"))
+    no = db.Column(db.Integer, nullable=False, default=text("1"))
     """The account number under the base account."""
-    title_l10n: Mapped[str] = mapped_column("title")
+    title_l10n = db.Column("title", db.String, nullable=False)
     """The title."""
-    is_need_offset: Mapped[bool] = mapped_column(default=False)
+    is_need_offset = db.Column(db.Boolean, nullable=False, default=False)
     """Whether the journal entry line items of this account need offset."""
-    created_at: Mapped[dt.datetime] \
+    created_at = db.Column(db.DateTime(timezone=True), nullable=False,
-        = mapped_column(db.DateTime(timezone=True),
+                           server_default=db.func.now())
-                        server_default=db.func.now())
+    """The time of creation."""
-    """The date and time when this record was created."""
+    created_by_id = db.Column(db.Integer,
-    created_by_id: Mapped[int] \
+                              db.ForeignKey(user_pk_column,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                                            onupdate="CASCADE"),
-    """The ID of the user who created the record."""
+                              nullable=False)
-    created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
+    """The ID of the creator."""
-    """The user who created the record."""
+    created_by = db.relationship(user_cls, foreign_keys=created_by_id)
-    updated_at: Mapped[dt.datetime] \
+    """The creator."""
-        = mapped_column(db.DateTime(timezone=True),
+    updated_at = db.Column(db.DateTime(timezone=True), nullable=False,
-                        server_default=db.func.now())
+                           server_default=db.func.now())
-    """The date and time when this record was last updated."""
+    """The time of last update."""
-    updated_by_id: Mapped[int] \
+    updated_by_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                              db.ForeignKey(user_pk_column,
-    """The ID of the last user who updated the record."""
+                                            onupdate="CASCADE"),
-    updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
+                              nullable=False)
-    """The last user who updated the record."""
+    """The ID of the updator."""
-    l10n: Mapped[list[AccountL10n]] \
+    updated_by = db.relationship(user_cls, foreign_keys=updated_by_id)
-        = db.relationship(back_populates="account", lazy=False)
+    """The updator."""
+    l10n = db.relationship("AccountL10n", back_populates="account",
+                           lazy=False)
     """The localized titles."""
-    line_items: Mapped[list[JournalEntryLineItem]] \
+    line_items = db.relationship("JournalEntryLineItem",
-        = db.relationship(back_populates="account")
+                                 back_populates="account")
     """The journal entry line items."""
 
     CASH_CODE: str = "1111-001"
@@ -151,7 +154,7 @@ class Account(db.Model):
 
         :return: The string representation of this account.
         """
-        return f"{self.base_code}-{self.no:03d} {self.title}"
+        return f"{self.base_code}-{self.no:03d} {self.title.title()}"
 
     @property
     def code(self) -> str:
@@ -182,8 +185,6 @@ class Account(db.Model):
         :param value: The new title.
         :return: None.
         """
-        if self.title == value:
-            return
         if self.title_l10n is None:
             self.title_l10n = value
             return
@@ -224,13 +225,13 @@ class Account(db.Model):
         return getattr(self, "__count")
 
     @count.setter
-    def count(self, value: int) -> None:
+    def count(self, count: int) -> None:
         """Sets the number of items in the account.
 
-        :param value: The number of items in the account.
+        :param count: The number of items in the account.
         :return: None.
         """
-        setattr(self, "__count", value)
+        setattr(self, "__count", count)
 
     @property
     def query_values(self) -> list[str]:
@@ -269,11 +270,11 @@ class Account(db.Model):
         :return: None.
         """
         AccountL10n.query.filter(AccountL10n.account == self).delete()
-        cls: Type[Self] = self.__class__
+        cls: t.Type[t.Self] = self.__class__
         cls.query.filter(cls.id == self.id).delete()
 
     @classmethod
-    def find_by_code(cls, code: str) -> Self | None:
+    def find_by_code(cls, code: str) -> t.Self | None:
         """Finds an account by its code.
 
         :param code: The code.
@@ -286,7 +287,7 @@ class Account(db.Model):
                                 cls.no == int(m.group(2))).first()
 
     @classmethod
-    def selectable_debit(cls) -> list[Self]:
+    def selectable_debit(cls) -> list[t.Self]:
         """Returns the selectable debit accounts.
         Payable line items can not start from debit.
 
@@ -304,11 +305,12 @@ class Account(db.Model):
                                        cls.base_code.startswith("78"),
                                        cls.base_code.startswith("8"),
                                        cls.base_code.startswith("9")),
+                                cls.base_code != "3351",
                                 cls.base_code != "3353")\
             .order_by(cls.base_code, cls.no).all()
 
     @classmethod
-    def selectable_credit(cls) -> list[Self]:
+    def selectable_credit(cls) -> list[t.Self]:
         """Returns the selectable debit accounts.
         Receivable line items can not start from credit.
 
@@ -325,11 +327,12 @@ class Account(db.Model):
                                        cls.base_code.startswith("74"),
                                        cls.base_code.startswith("8"),
                                        cls.base_code.startswith("9")),
+                                cls.base_code != "3351",
                                 cls.base_code != "3353")\
             .order_by(cls.base_code, cls.no).all()
 
     @classmethod
-    def cash(cls) -> Self:
+    def cash(cls) -> t.Self:
         """Returns the cash account.
 
         :return: The cash account
@@ -337,7 +340,7 @@ class Account(db.Model):
         return cls.find_by_code(cls.CASH_CODE)
 
     @classmethod
-    def accumulated_change(cls) -> Self:
+    def accumulated_change(cls) -> t.Self:
         """Returns the accumulated-change account.
 
         :return: The accumulated-change account
@@ -349,16 +352,16 @@ class AccountL10n(db.Model):
     """A localized account title."""
     __tablename__ = "accounting_accounts_l10n"
     """The table name."""
-    account_id: Mapped[int] \
+    account_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(Account.id, onupdate="CASCADE",
+                           db.ForeignKey(Account.id, onupdate="CASCADE",
-                                      ondelete="CASCADE"),
+                                         ondelete="CASCADE"),
-                        primary_key=True)
+                           nullable=False, primary_key=True)
     """The account ID."""
-    account: Mapped[Account] = db.relationship(back_populates="l10n")
+    account = db.relationship(Account, back_populates="l10n")
     """The account."""
-    locale: Mapped[str] = mapped_column(primary_key=True)
+    locale = db.Column(db.String, nullable=False, primary_key=True)
     """The locale."""
-    title: Mapped[str]
+    title = db.Column(db.String, nullable=False)
     """The localized title."""
 
 
@@ -366,34 +369,35 @@ class Currency(db.Model):
     """A currency."""
     __tablename__ = "accounting_currencies"
     """The table name."""
-    code: Mapped[str] = mapped_column(primary_key=True)
+    code = db.Column(db.String, nullable=False, primary_key=True)
-    """The currency code."""
+    """The code."""
-    name_l10n: Mapped[str] = mapped_column("name")
+    name_l10n = db.Column("name", db.String, nullable=False)
-    """The currency name."""
+    """The name."""
-    created_at: Mapped[dt.datetime] \
+    created_at = db.Column(db.DateTime(timezone=True), nullable=False,
-        = mapped_column(db.DateTime(timezone=True),
+                           server_default=db.func.now())
-                        server_default=db.func.now())
+    """The time of creation."""
-    """The date and time when this record was created."""
+    created_by_id = db.Column(db.Integer,
-    created_by_id: Mapped[int] \
+                              db.ForeignKey(user_pk_column,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                                            onupdate="CASCADE"),
-    """The ID of the user who created the record."""
+                              nullable=False)
-    created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
+    """The ID of the creator."""
-    """The user who created the record."""
+    created_by = db.relationship(user_cls, foreign_keys=created_by_id)
-    updated_at: Mapped[dt.datetime] \
+    """The creator."""
-        = mapped_column(db.DateTime(timezone=True),
+    updated_at = db.Column(db.DateTime(timezone=True), nullable=False,
-                        server_default=db.func.now())
+                           server_default=db.func.now())
-    """The date and time when this record was last updated."""
+    """The time of last update."""
-    updated_by_id: Mapped[int] \
+    updated_by_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                              db.ForeignKey(user_pk_column,
-    """The ID of the last user who updated the record."""
+                                            onupdate="CASCADE"),
-    updated_by: Mapped[user_cls] \
+                              nullable=False)
-        = db.relationship(foreign_keys=updated_by_id)
+    """The ID of the updator."""
-    """The last user who updated the record."""
+    updated_by = db.relationship(user_cls, foreign_keys=updated_by_id)
-    l10n: Mapped[list[CurrencyL10n]] \
+    """The updator."""
-        = db.relationship(back_populates="currency", lazy=False)
+    l10n = db.relationship("CurrencyL10n", back_populates="currency",
+                           lazy=False)
     """The localized names."""
-    line_items: Mapped[list[JournalEntryLineItem]] \
+    line_items = db.relationship("JournalEntryLineItem",
-        = db.relationship(back_populates="currency")
+                                 back_populates="currency")
     """The journal entry line items."""
 
     def __str__(self) -> str:
@@ -424,8 +428,6 @@ class Currency(db.Model):
         :param value: The new name.
         :return: None.
         """
-        if self.name == value:
-            return
         if self.name_l10n is None:
             self.name_l10n = value
             return
@@ -469,7 +471,7 @@ class Currency(db.Model):
         :return: None.
         """
         CurrencyL10n.query.filter(CurrencyL10n.currency == self).delete()
-        cls: Type[Self] = self.__class__
+        cls: t.Type[t.Self] = self.__class__
         cls.query.filter(cls.code == self.code).delete()
 
 
@@ -477,16 +479,16 @@ class CurrencyL10n(db.Model):
     """A localized currency name."""
     __tablename__ = "accounting_currencies_l10n"
     """The table name."""
-    currency_code: Mapped[str] \
+    currency_code = db.Column(db.String,
-        = mapped_column(db.ForeignKey(Currency.code, onupdate="CASCADE",
+                              db.ForeignKey(Currency.code, onupdate="CASCADE",
-                                      ondelete="CASCADE"),
+                                            ondelete="CASCADE"),
-                        primary_key=True)
+                              nullable=False, primary_key=True)
     """The currency code."""
-    currency: Mapped[Currency] = db.relationship(back_populates="l10n")
+    currency = db.relationship(Currency, back_populates="l10n")
     """The currency."""
-    locale: Mapped[str] = mapped_column(primary_key=True)
+    locale = db.Column(db.String, nullable=False, primary_key=True)
     """The locale."""
-    name: Mapped[str]
+    name = db.Column(db.String, nullable=False)
     """The localized name."""
 
 
@@ -537,34 +539,37 @@ class JournalEntry(db.Model):
     """A journal entry."""
     __tablename__ = "accounting_journal_entries"
     """The table name."""
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=False)
+    id = db.Column(db.Integer, nullable=False, primary_key=True,
+                   autoincrement=False)
     """The journal entry ID."""
-    date: Mapped[dt.date]
+    date = db.Column(db.Date, nullable=False)
     """The date."""
-    no: Mapped[int] = mapped_column(default=text("1"))
+    no = db.Column(db.Integer, nullable=False, default=text("1"))
-    """The journal entry number under the date."""
+    """The account number under the date."""
-    note: Mapped[str | None]
+    note = db.Column(db.String)
     """The note."""
-    created_at: Mapped[dt.datetime] \
+    created_at = db.Column(db.DateTime(timezone=True), nullable=False,
-        = mapped_column(db.DateTime(timezone=True),
+                           server_default=db.func.now())
-                        server_default=db.func.now())
+    """The time of creation."""
-    """The date and time when this record was created."""
+    created_by_id = db.Column(db.Integer,
-    created_by_id: Mapped[int] \
+                              db.ForeignKey(user_pk_column,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                                            onupdate="CASCADE"),
-    """The ID of the user who created the record."""
+                              nullable=False)
-    created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
+    """The ID of the creator."""
-    """The user who created the record."""
+    created_by = db.relationship(user_cls, foreign_keys=created_by_id)
-    updated_at: Mapped[dt.datetime] \
+    """The creator."""
-        = mapped_column(db.DateTime(timezone=True),
+    updated_at = db.Column(db.DateTime(timezone=True), nullable=False,
-                        server_default=db.func.now())
+                           server_default=db.func.now())
-    """The date and time when this record was last updated."""
+    """The time of last update."""
-    updated_by_id: Mapped[int] \
+    updated_by_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                              db.ForeignKey(user_pk_column,
-    """The ID of the last user who updated the record."""
+                                            onupdate="CASCADE"),
-    updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
+                              nullable=False)
-    """The last user who updated the record."""
+    """The ID of the updator."""
-    line_items: Mapped[list[JournalEntryLineItem]] \
+    updated_by = db.relationship(user_cls, foreign_keys=updated_by_id)
-        = db.relationship(back_populates="journal_entry")
+    """The updator."""
+    line_items = db.relationship("JournalEntryLineItem",
+                                 back_populates="journal_entry")
     """The line items."""
 
     def __str__(self) -> str:
@@ -654,39 +659,44 @@ class JournalEntryLineItem(db.Model):
     """A line item in the journal entry."""
     __tablename__ = "accounting_journal_entry_line_items"
     """The table name."""
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=False)
+    id = db.Column(db.Integer, nullable=False, primary_key=True,
+                   autoincrement=False)
     """The line item ID."""
-    journal_entry_id: Mapped[int] \
+    journal_entry_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(JournalEntry.id, onupdate="CASCADE",
+                                 db.ForeignKey(JournalEntry.id,
-                                      ondelete="CASCADE"))
+                                               onupdate="CASCADE",
+                                               ondelete="CASCADE"),
+                                 nullable=False)
     """The journal entry ID."""
-    journal_entry: Mapped[JournalEntry] \
+    journal_entry = db.relationship(JournalEntry, back_populates="line_items")
-        = db.relationship(back_populates="line_items")
     """The journal entry."""
-    is_debit: Mapped[bool]
+    is_debit = db.Column(db.Boolean, nullable=False)
     """True for a debit line item, or False for a credit line item."""
-    no: Mapped[int]
+    no = db.Column(db.Integer, nullable=False)
     """The line item number under the journal entry and debit or credit."""
-    original_line_item_id: Mapped[int | None] \
+    original_line_item_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(id, onupdate="CASCADE"))
+                                      db.ForeignKey(id, onupdate="CASCADE"),
+                                      nullable=True)
     """The ID of the original line item."""
-    original_line_item: Mapped[JournalEntryLineItem | None] \
+    original_line_item = db.relationship("JournalEntryLineItem",
-        = db.relationship(remote_side=id, passive_deletes=True)
+                                         remote_side=id, passive_deletes=True)
     """The original line item."""
-    currency_code: Mapped[str] \
+    currency_code = db.Column(db.String,
-        = mapped_column(db.ForeignKey(Currency.code, onupdate="CASCADE"))
+                              db.ForeignKey(Currency.code, onupdate="CASCADE"),
+                              nullable=False)
     """The currency code."""
-    currency: Mapped[Currency] = db.relationship(back_populates="line_items")
+    currency = db.relationship(Currency, back_populates="line_items")
     """The currency."""
-    account_id: Mapped[int] \
+    account_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(Account.id, onupdate="CASCADE"))
+                           db.ForeignKey(Account.id,
+                                         onupdate="CASCADE"),
+                           nullable=False)
     """The account ID."""
-    account: Mapped[Account] \
+    account = db.relationship(Account, back_populates="line_items", lazy=False)
-        = db.relationship(back_populates="line_items", lazy=False)
     """The account."""
-    description: Mapped[str | None]
+    description = db.Column(db.String, nullable=True)
     """The description."""
-    amount: Mapped[Decimal] = mapped_column(db.Numeric(14, 2))
+    amount = db.Column(db.Numeric(14, 2), nullable=False)
     """The amount."""
 
     def __str__(self) -> str:
@@ -732,18 +742,7 @@ class JournalEntryLineItem(db.Model):
 
         :return: The debit amount, or None if this is not a debit line item.
         """
-        if not hasattr(self, "__debit"):
+        return self.amount if self.is_debit else None
-            setattr(self, "__debit", self.amount if self.is_debit else None)
-        return getattr(self, "__debit")
-
-    @debit.setter
-    def debit(self, value: Decimal | None) -> None:
-        """Sets the debit amount.
-
-        :param value: The debit amount.
-        :return: None.
-        """
-        setattr(self, "__debit", value)
 
     @property
     def credit(self) -> Decimal | None:
@@ -751,18 +750,7 @@ class JournalEntryLineItem(db.Model):
 
         :return: The credit amount, or None if this is not a credit line item.
         """
-        if not hasattr(self, "__credit"):
+        return None if self.is_debit else self.amount
-            setattr(self, "__credit", None if self.is_debit else self.amount)
-        return getattr(self, "__credit")
-
-    @credit.setter
-    def credit(self, value: Decimal | None) -> None:
-        """Sets the credit amount.
-
-        :param value: The credit amount.
-        :return: None.
-        """
-        setattr(self, "__credit", value)
 
     @property
     def net_balance(self) -> Decimal:
@@ -777,42 +765,23 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__net_balance")
 
     @net_balance.setter
-    def net_balance(self, value: Decimal) -> None:
+    def net_balance(self, net_balance: Decimal) -> None:
         """Sets the net balance.
 
-        :param value: The net balance.
+        :param net_balance: The net balance.
         :return: None.
         """
-        setattr(self, "__net_balance", value)
+        setattr(self, "__net_balance", net_balance)
 
     @property
-    def balance(self) -> Decimal:
+    def offsets(self) -> list[t.Self]:
-        """Returns the balance.
-
-        :return: The balance.
-        """
-        if not hasattr(self, "__balance"):
-            setattr(self, "__balance", Decimal("0"))
-        return getattr(self, "__balance")
-
-    @balance.setter
-    def balance(self, value: Decimal) -> None:
-        """Sets the balance.
-
-        :param value: The balance.
-        :return: None.
-        """
-        setattr(self, "__balance", value)
-
-    @property
-    def offsets(self) -> list[Self]:
         """Returns the offset items.
 
         :return: The offset items.
         """
         if not hasattr(self, "__offsets"):
-            cls: Type[Self] = self.__class__
+            cls: t.Type[t.Self] = self.__class__
-            offsets: list[Self] = cls.query.join(JournalEntry)\
+            offsets: list[t.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()
@@ -820,26 +789,7 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__offsets")
 
     @property
-    def is_offset(self) -> bool:
+    def match(self) -> t.Self | None:
-        """Returns whether the line item is an offset.
-
-        :return: True if the line item is an offset, or False otherwise.
-        """
-        if not hasattr(self, "__is_offset"):
-            setattr(self, "__is_offset", False)
-        return getattr(self, "__is_offset")
-
-    @is_offset.setter
-    def is_offset(self, value: bool) -> None:
-        """Sets whether the line item is an offset.
-
-        :param value: True if the line item is an offset, or False otherwise.
-        :return: None.
-        """
-        setattr(self, "__is_offset", value)
-
-    @property
-    def match(self) -> Self | None:
         """Returns the match of the line item.
 
         :return: The match of the line item.
@@ -849,13 +799,13 @@ class JournalEntryLineItem(db.Model):
         return getattr(self, "__match")
 
     @match.setter
-    def match(self, value: Self) -> None:
+    def match(self, match: t.Self) -> None:
         """Sets the match of the line item.
 
-        :param value: The matcho of the line item.
+        :param match: The matcho of the line item.
         :return: None.
         """
-        setattr(self, "__match", value)
+        setattr(self, "__match", match)
 
     @property
     def query_values(self) -> list[str]:
@@ -872,7 +822,6 @@ class JournalEntryLineItem(db.Model):
                                   self.journal_entry.date.month,
                                   self.journal_entry.date.day),
                 "" if self.description is None else self.description,
-                str(self.account),
                 format_amount(self.amount)]
 
 
@@ -880,25 +829,27 @@ class Option(db.Model):
     """An option."""
     __tablename__ = "accounting_options"
     """The table name."""
-    name: Mapped[str] = mapped_column(primary_key=True)
+    name = db.Column(db.String, nullable=False, primary_key=True)
     """The name."""
-    value: Mapped[str] = mapped_column(db.Text)
+    value = db.Column(db.Text, nullable=False)
     """The option value."""
-    created_at: Mapped[dt.datetime] \
+    created_at = db.Column(db.DateTime(timezone=True), nullable=False,
-        = mapped_column(db.DateTime(timezone=True),
+                           server_default=db.func.now())
-                        server_default=db.func.now())
+    """The time of creation."""
-    """The date and time when this record was created."""
+    created_by_id = db.Column(db.Integer,
-    created_by_id: Mapped[int] \
+                              db.ForeignKey(user_pk_column,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                                            onupdate="CASCADE"),
-    """The ID of the user who created the record."""
+                              nullable=False)
-    created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
+    """The ID of the creator."""
-    """The user who created the record."""
+    created_by = db.relationship(user_cls, foreign_keys=created_by_id)
-    updated_at: Mapped[dt.datetime] \
+    """The creator."""
-        = mapped_column(db.DateTime(timezone=True),
+    updated_at = db.Column(db.DateTime(timezone=True), nullable=False,
-                        server_default=db.func.now())
+                           server_default=db.func.now())
-    """The date and time when this record was last updated."""
+    """The time of last update."""
-    updated_by_id: Mapped[int] \
+    updated_by_id = db.Column(db.Integer,
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
+                              db.ForeignKey(user_pk_column,
-    """The ID of the last user who updated the record."""
+                                            onupdate="CASCADE"),
-    updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
+                              nullable=False)
-    """The last user who updated the record."""
+    """The ID of the updator."""
+    updated_by = db.relationship(user_cls, foreign_keys=updated_by_id)
+    """The updator."""

src/accounting/report/period/chooser.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/3/4
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -20,11 +20,10 @@ This file is largely taken from the NanoParma ERP project, first written in
 2021/9/16 by imacat (imacat@nanoparma.com).
 
 """
-import datetime as dt
+import typing as t
-from collections.abc import Callable
+from datetime import date
 
 from accounting.models import JournalEntry
-from accounting.utils.timezone import get_tz_today
 from .period import Period
 from .shortcuts import ThisMonth, LastMonth, SinceLastMonth, ThisYear, \
     LastYear, Today, Yesterday, AllTime, TemplatePeriod, YearPeriod
@@ -33,13 +32,13 @@ from .shortcuts import ThisMonth, LastMonth, SinceLastMonth, ThisYear, \
 class PeriodChooser:
     """The period chooser."""
 
-    def __init__(self, get_url: Callable[[Period], str]):
+    def __init__(self, get_url: t.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: Callable[[Period], str] = get_url
+        self.__get_url: t.Callable[[Period], str] = get_url
         """The callback to return the URL of the current report in a period."""
 
         # Shortcut periods
@@ -64,10 +63,10 @@ class PeriodChooser:
 
         first: JournalEntry | None \
             = JournalEntry.query.order_by(JournalEntry.date).first()
-        start: dt.date | None = None if first is None else first.date
+        start: date | None = None if first is None else first.date
 
         # Attributes
-        self.data_start: dt.date | None = start
+        self.data_start: date | None = start
         """The start of the data."""
         self.has_data: bool = start is not None
         """Whether there is any data."""
@@ -81,8 +80,8 @@ class PeriodChooser:
         """The available years."""
 
         if self.has_data:
-            today: dt.date = get_tz_today()
+            today: date = date.today()
-            self.has_last_month = start < dt.date(today.year, today.month, 1)
+            self.has_last_month = start < 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.
 
 """
-import datetime as dt
+from datetime import date, timedelta
 
 from accounting.locale import gettext
 
 
-def get_desc(start: dt.date | None, end: dt.date | None) -> str:
+def get_desc(start: date | None, end: date | None) -> str:
     """Returns the period description.
 
     :param start: The start of the period.
@@ -46,7 +46,7 @@ def get_desc(start: dt.date | None, end: dt.date | None) -> str:
     return __get_day_desc(start, end)
 
 
-def __get_since_desc(start: dt.date) -> str:
+def __get_since_desc(start: 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: dt.date) -> str:
     return gettext("since %(start)s", start=get_start_desc())
 
 
-def __get_until_desc(end: dt.date) -> str:
+def __get_until_desc(end: 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: dt.date) -> str:
         """
         if end.month == 12 and end.day == 31:
             return str(end.year)
-        if (end + dt.timedelta(days=1)).day == 1:
+        if (end + 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: dt.date, end: dt.date) -> str:
+def __get_year_desc(start: date, end: 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: dt.date, end: dt.date) -> str:
     return __get_from_to_desc(start_text, str(end.year))
 
 
-def __get_month_desc(start: dt.date, end: dt.date) -> str:
+def __get_month_desc(start: date, end: 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: dt.date, end: dt.date) -> str:
     :return: The description as a month range.
     :raise ValueError: The period is not a month range.
     """
-    if start.day != 1 or (end + dt.timedelta(days=1)).day != 1:
+    if start.day != 1 or (end + 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: dt.date, end: dt.date) -> str:
     return __get_from_to_desc(start_text, __format_month(end))
 
 
-def __get_day_desc(start: dt.date, end: dt.date) -> str:
+def __get_day_desc(start: date, end: 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: dt.date, end: dt.date) -> str:
     return __get_from_to_desc(start_text, __format_day(end))
 
 
-def __format_month(month: dt.date) -> str:
+def __format_month(month: date) -> str:
     """Formats a month.
 
     :param month: The month.
@@ -151,7 +151,7 @@ def __format_month(month: dt.date) -> str:
     return f"{month.year}/{month.month}"
 
 
-def __format_day(day: dt.date) -> str:
+def __format_day(day: date) -> str:
     """Formats a day.
 
     :param day: The day.

src/accounting/report/period/month_end.py

@@ -18,14 +18,14 @@
 
 """
 import calendar
-import datetime as dt
+from datetime import date
 
 
-def month_end(day: dt.date) -> dt.date:
+def month_end(day: date) -> 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 dt.date(day.year, day.month, last_day)
+    return date(day.year, day.month, last_day)

src/accounting/report/period/parser.py

@@ -18,10 +18,9 @@
 
 """
 import calendar
-import datetime as dt
 import re
-from collections.abc import Callable
+import typing as t
-from typing import Type
+from datetime import date
 
 from .period import Period
 from .shortcuts import ThisMonth, LastMonth, SinceLastMonth, ThisYear, \
@@ -40,7 +39,7 @@ def get_period(spec: str | None = None) -> Period:
     """
     if spec is None:
         return ThisMonth()
-    named_periods: dict[str, Type[Callable[[], Period]]] = {
+    named_periods: dict[str, t.Type[t.Callable[[], Period]]] = {
         "this-month": lambda: ThisMonth(),
         "last-month": lambda: LastMonth(),
         "since-last-month": lambda: SinceLastMonth(),
@@ -58,7 +57,7 @@ def get_period(spec: str | None = None) -> Period:
     return Period(start, end)
 
 
-def __parse_spec(text: str) -> tuple[dt.date | None, dt.date | None]:
+def __parse_spec(text: str) -> tuple[date | None, date | None]:
     """Parses the period specification.
 
     :param text: The period specification.
@@ -85,7 +84,7 @@ def __parse_spec(text: str) -> tuple[dt.date | None, dt.date | None]:
     raise ValueError
 
 
-def __get_start(year: str, month: str | None, day: str | None) -> dt.date:
+def __get_start(year: str, month: str | None, day: str | None) -> date:
     """Returns the start of the period from the date representation.
 
     :param year: The year.
@@ -95,13 +94,13 @@ def __get_start(year: str, month: str | None, day: str | None) -> dt.date:
     :raise ValueError: When the date is invalid.
     """
     if day is not None:
-        return dt.date(int(year), int(month), int(day))
+        return date(int(year), int(month), int(day))
     if month is not None:
-        return dt.date(int(year), int(month), 1)
+        return date(int(year), int(month), 1)
-    return dt.date(int(year), 1, 1)
+    return date(int(year), 1, 1)
 
 
-def __get_end(year: str, month: str | None, day: str | None) -> dt.date:
+def __get_end(year: str, month: str | None, day: str | None) -> date:
     """Returns the end of the period from the date representation.
 
     :param year: The year.
@@ -111,10 +110,10 @@ def __get_end(year: str, month: str | None, day: str | None) -> dt.date:
     :raise ValueError: When the date is invalid.
     """
     if day is not None:
-        return dt.date(int(year), int(month), int(day))
+        return 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 dt.date(year_n, month_n, day_n)
+        return date(year_n, month_n, day_n)
-    return dt.date(int(year), 12, 31)
+    return 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 datetime as dt
+import typing as t
-from typing import Self
+from datetime import date, timedelta
 
 from .description import get_desc
 from .month_end import month_end
@@ -31,18 +31,18 @@ from .specification import get_spec
 class Period:
     """A date period."""
 
-    def __init__(self, start: dt.date | None, end: dt.date | None):
+    def __init__(self, start: date | None, end: 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: dt.date | None = start
+        self.start: date | None = start
         """The start of the period."""
-        self.end: dt.date | None = end
+        self.end: date | None = end
         """The end of the period."""
         self.is_default: bool = False
-        """Whether this is the default period."""
+        """Whether the is the default period."""
         self.is_this_month: bool = False
         """Whether the period is this month."""
         self.is_last_month: bool = False
@@ -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 == dt.date(self.start.year, 1, 1) \
+        self.is_a_year = self.start == date(self.start.year, 1, 1) \
-            and self.end == dt.date(self.start.year, 12, 31)
+            and self.end == 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) -> Self | None:
+    def before(self) -> t.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 - dt.timedelta(days=1))
+        return Period(None, self.start - timedelta(days=1))

src/accounting/report/period/shortcuts.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/3/4
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@
 """The named shortcut periods.
 
 """
-import datetime as dt
+from datetime import date, timedelta
 
 from accounting.locale import gettext
-from accounting.utils.timezone import get_tz_today
 from .month_end import month_end
 from .period import Period
 
@@ -28,8 +27,8 @@ from .period import Period
 class ThisMonth(Period):
     """The period of this month."""
     def __init__(self):
-        today: dt.date = get_tz_today()
+        today: date = date.today()
-        this_month_start: dt.date = dt.date(today.year, today.month, 1)
+        this_month_start: date = date(today.year, today.month, 1)
         super().__init__(this_month_start, month_end(today))
         self.is_default = True
         self.is_this_month = True
@@ -44,13 +43,13 @@ class ThisMonth(Period):
 class LastMonth(Period):
     """The period of this month."""
     def __init__(self):
-        today: dt.date = get_tz_today()
+        today: date = date.today()
         year: int = today.year
         month: int = today.month - 1
         if month < 1:
             year = year - 1
             month = 12
-        start: dt.date = dt.date(year, month, 1)
+        start: date = date(year, month, 1)
         super().__init__(start, month_end(start))
         self.is_last_month = True
 
@@ -64,13 +63,13 @@ class LastMonth(Period):
 class SinceLastMonth(Period):
     """The period of this month."""
     def __init__(self):
-        today: dt.date = get_tz_today()
+        today: date = date.today()
         year: int = today.year
         month: int = today.month - 1
         if month < 1:
             year = year - 1
             month = 12
-        start: dt.date = dt.date(year, month, 1)
+        start: date = date(year, month, 1)
         super().__init__(start, None)
         self.is_since_last_month = True
 
@@ -83,9 +82,9 @@ class SinceLastMonth(Period):
 class ThisYear(Period):
     """The period of this year."""
     def __init__(self):
-        year: int = get_tz_today().year
+        year: int = date.today().year
-        start: dt.date = dt.date(year, 1, 1)
+        start: date = date(year, 1, 1)
-        end: dt.date = dt.date(year, 12, 31)
+        end: date = date(year, 12, 31)
         super().__init__(start, end)
         self.is_this_year = True
 
@@ -98,9 +97,9 @@ class ThisYear(Period):
 class LastYear(Period):
     """The period of last year."""
     def __init__(self):
-        year: int = get_tz_today().year
+        year: int = date.today().year
-        start: dt.date = dt.date(year - 1, 1, 1)
+        start: date = date(year - 1, 1, 1)
-        end: dt.date = dt.date(year - 1, 12, 31)
+        end: date = date(year - 1, 12, 31)
         super().__init__(start, end)
         self.is_last_year = True
 
@@ -113,7 +112,7 @@ class LastYear(Period):
 class Today(Period):
     """The period of today."""
     def __init__(self):
-        today: dt.date = get_tz_today()
+        today: date = date.today()
         super().__init__(today, today)
         self.is_today = True
 
@@ -126,7 +125,7 @@ class Today(Period):
 class Yesterday(Period):
     """The period of yesterday."""
     def __init__(self):
-        yesterday: dt.date = get_tz_today() - dt.timedelta(days=1)
+        yesterday: date = date.today() - timedelta(days=1)
         super().__init__(yesterday, yesterday)
         self.is_yesterday = True
 
@@ -164,6 +163,6 @@ class YearPeriod(Period):
 
         :param year: The year.
         """
-        start: dt.date = dt.date(year, 1, 1)
+        start: date = date(year, 1, 1)
-        end: dt.date = dt.date(year, 12, 31)
+        end: date = date(year, 12, 31)
         super().__init__(start, end)

src/accounting/report/period/specification.py

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

src/accounting/report/reports/balance_sheet.py

@@ -145,7 +145,6 @@ class AccountCollector:
             .filter(sa.or_(Account.id.in_({x.id for x in account_balances}),
                            Account.base_code == "3351",
                            Account.base_code == "3353")).all()
-        """The accounts."""
         account_by_id: dict[int, Account] \
             = {x.id: x for x in self.__all_accounts}
         self.accounts: list[ReportAccount] \
@@ -155,7 +154,6 @@ class AccountCollector:
                                             account_by_id[x.id],
                                             self.__period))
                for x in account_balances]
-        """The accounts on the balance sheet."""
         self.__add_accumulated()
         self.__add_current_period()
         self.accounts.sort(key=lambda x: (x.account.base_code, x.account.no))
@@ -454,11 +452,11 @@ class BalanceSheet(BaseReport):
         :return: The CSV rows for the section.
         """
         rows: list[CSVHalfRow] \
-            = [CSVHalfRow(section.title.title, None)]
+            = [CSVHalfRow(section.title.title.title(), None)]
         for subsection in section.subsections:
-            rows.append(CSVHalfRow(f" {subsection.title.title}", None))
+            rows.append(CSVHalfRow(f" {subsection.title.title.title()}", None))
             for account in subsection.accounts:
-                rows.append(CSVHalfRow(f"  {str(account.account)}",
+                rows.append(CSVHalfRow(f"  {str(account.account).title()}",
                                        account.amount))
         return rows
 

src/accounting/report/reports/income_expenses.py

@@ -17,7 +17,7 @@
 """The income and expenses log.
 
 """
-import datetime as dt
+from datetime import date
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -37,6 +37,7 @@ from accounting.report.utils.option_link import OptionLink
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import income_expenses_url
+from accounting.utils.cast import be
 from accounting.utils.current_account import CurrentAccount
 from accounting.utils.pagination import Pagination
 
@@ -53,7 +54,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: dt.date | None = None
+        self.date: date | None = None
         """The date."""
         self.account: Account | None = None
         """The account."""
@@ -121,7 +122,8 @@ class LineItemCollector:
             else_=-JournalEntryLineItem.amount))
         select: sa.Select = sa.Select(balance_func)\
             .join(JournalEntry).join(Account)\
-            .filter(JournalEntryLineItem.currency_code == self.__currency.code,
+            .filter(be(JournalEntryLineItem.currency_code
+                       == self.__currency.code),
                     self.__account_condition,
                     JournalEntry.date < self.__period.start)
         balance: int | None = db.session.scalar(select)
@@ -213,7 +215,7 @@ class LineItemCollector:
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, date: dt.date | str | None,
+    def __init__(self, journal_entry_date: date | str | None,
                  account: str | None,
                  description: str | None,
                  income: str | Decimal | None,
@@ -222,7 +224,7 @@ class CSVRow(BaseCSVRow):
                  note: str | None):
         """Constructs a row in the CSV.
 
-        :param date: The journal entry date.
+        :param journal_entry_date: The journal entry date.
         :param account: The account.
         :param description: The description.
         :param income: The income.
@@ -230,7 +232,7 @@ class CSVRow(BaseCSVRow):
         :param balance: The balance.
         :param note: The note.
         """
-        self.date: dt.date | str | None = date
+        self.date: date | str | None = journal_entry_date
         """The date."""
         self.account: str | None = account
         """The account."""
@@ -345,7 +347,8 @@ class PageParams(BasePageParams):
                           self.account.id == 0)]
         in_use: sa.Select = sa.Select(JournalEntryLineItem.account_id)\
             .join(Account)\
-            .filter(JournalEntryLineItem.currency_code == self.currency.code,
+            .filter(be(JournalEntryLineItem.currency_code
+                       == self.currency.code),
                     CurrentAccount.sql_condition())\
             .group_by(JournalEntryLineItem.account_id)
         options.extend([OptionLink(str(x),
@@ -407,13 +410,13 @@ class IncomeExpenses(BaseReport):
                                      gettext("Note"))]
         if self.__brought_forward is not None:
             rows.append(CSVRow(self.__brought_forward.date,
-                               str(self.__brought_forward.account),
+                               str(self.__brought_forward.account).title(),
                                self.__brought_forward.description,
                                self.__brought_forward.income,
                                self.__brought_forward.expense,
                                self.__brought_forward.balance,
                                None))
-        rows.extend([CSVRow(x.date, str(x.account), x.description,
+        rows.extend([CSVRow(x.date, str(x.account).title(), x.description,
                             x.income, x.expense, x.balance, x.note)
                      for x in self.__line_items])
         if self.__total is not None:

src/accounting/report/reports/income_statement.py

@@ -106,7 +106,6 @@ class Section:
         """The subsections in the section."""
         self.accumulated: AccumulatedTotal \
             = AccumulatedTotal(accumulated_title)
-        """The accumulated total."""
 
     @property
     def total(self) -> Decimal:
@@ -226,12 +225,12 @@ class IncomeStatement(BaseReport):
                                           for x in balances})).all()
 
         total_titles: dict[str, str] \
-            = {"4": gettext("Total Operating Revenue"),
+            = {"4": gettext("total operating revenue"),
-               "5": gettext("Gross Income"),
+               "5": gettext("gross income"),
-               "6": gettext("Operating Income"),
+               "6": gettext("operating income"),
-               "7": gettext("Before Tax Income"),
+               "7": gettext("before tax income"),
-               "8": gettext("After Tax Income"),
+               "8": gettext("after tax income"),
-               "9": gettext("Net Income or Loss for Current Period")}
+               "9": gettext("net income or loss for current period")}
 
         sections: dict[str, Section] \
             = {x.code: Section(x, total_titles[x.code]) for x in titles}
@@ -301,14 +300,14 @@ class IncomeStatement(BaseReport):
         total_str: str = gettext("Total")
         rows: list[CSVRow] = [CSVRow(None, gettext("Amount"))]
         for section in self.__sections:
-            rows.append(CSVRow(str(section.title), None))
+            rows.append(CSVRow(str(section.title).title(), None))
             for subsection in section.subsections:
-                rows.append(CSVRow(f" {str(subsection.title)}", None))
+                rows.append(CSVRow(f" {str(subsection.title).title()}", None))
                 for account in subsection.accounts:
-                    rows.append(CSVRow(f"  {str(account.account)}",
+                    rows.append(CSVRow(f"  {str(account.account).title()}",
                                        account.amount))
                 rows.append(CSVRow(f" {total_str}", subsection.total))
-            rows.append(CSVRow(section.accumulated.title,
+            rows.append(CSVRow(section.accumulated.title.title(),
                                section.accumulated.amount))
             rows.append(CSVRow(None, None))
         rows = rows[:-1]

src/accounting/report/reports/journal.py

@@ -17,7 +17,7 @@
 """The journal.
 
 """
-import datetime as dt
+from datetime import date
 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 | dt.date,
+    def __init__(self, journal_entry_date: str | 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 | dt.date = journal_entry_date
+        self.date: str | date = journal_entry_date
         """The date."""
         self.currency: str = currency
         """The currency."""
@@ -160,7 +160,7 @@ def get_csv_rows(line_items: list[JournalEntryLineItem]) -> list[CSVRow]:
                                  gettext("Debit"), gettext("Credit"),
                                  gettext("Note"))]
     rows.extend([CSVRow(x.journal_entry.date, x.currency.code,
-                        str(x.account), x.description,
+                        str(x.account).title(), x.description,
                         x.debit, x.credit, x.journal_entry.note)
                  for x in line_items])
     return rows

src/accounting/report/reports/ledger.py

@@ -17,7 +17,7 @@
 """The ledger.
 
 """
-import datetime as dt
+from datetime import date
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -37,6 +37,7 @@ from accounting.report.utils.option_link import OptionLink
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import ledger_url
+from accounting.utils.cast import be
 from accounting.utils.pagination import Pagination
 
 
@@ -52,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: dt.date | None = None
+        self.date: date | None = None
         """The date."""
         self.description: str | None = None
         """The description."""
@@ -117,8 +118,10 @@ class LineItemCollector:
             (JournalEntryLineItem.is_debit, JournalEntryLineItem.amount),
             else_=-JournalEntryLineItem.amount))
         select: sa.Select = sa.Select(balance_func).join(JournalEntry)\
-            .filter(JournalEntryLineItem.currency_code == self.__currency.code,
+            .filter(be(JournalEntryLineItem.currency_code
-                    JournalEntryLineItem.account_id == self.__account.id,
+                       == self.__currency.code),
+                    be(JournalEntryLineItem.account_id
+                       == self.__account.id),
                     JournalEntry.date < self.__period.start)
         balance: int | None = db.session.scalar(select)
         if balance is None:
@@ -196,7 +199,7 @@ class LineItemCollector:
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, date: dt.date | str | None,
+    def __init__(self, journal_entry_date: date | str | None,
                  description: str | None,
                  debit: str | Decimal | None,
                  credit: str | Decimal | None,
@@ -204,14 +207,14 @@ class CSVRow(BaseCSVRow):
                  note: str | None):
         """Constructs a row in the CSV.
 
-        :param date: The journal entry date.
+        :param journal_entry_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: dt.date | str | None = date
+        self.date: date | str | None = journal_entry_date
         """The date."""
         self.description: str | None = description
         """The description."""
@@ -310,7 +313,8 @@ class PageParams(BasePageParams):
         :return: The account options.
         """
         in_use: sa.Select = sa.Select(JournalEntryLineItem.account_id)\
-            .filter(JournalEntryLineItem.currency_code == self.currency.code)\
+            .filter(be(JournalEntryLineItem.currency_code
+                       == self.currency.code))\
             .group_by(JournalEntryLineItem.account_id)
         return [OptionLink(str(x), ledger_url(self.currency, x, self.period),
                            x.id == self.account.id)

src/accounting/report/reports/search.py

@@ -17,7 +17,7 @@
 """The search.
 
 """
-import datetime as dt
+from datetime import datetime
 from decimal import Decimal
 
 import sqlalchemy as sa
@@ -32,6 +32,7 @@ from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import csv_download
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
+from accounting.utils.cast import be
 from accounting.utils.pagination import Pagination
 from accounting.utils.query import parse_query_keywords
 from .journal import get_csv_rows
@@ -124,33 +125,41 @@ class LineItemCollector:
         """
         conditions: list[sa.BinaryExpression] \
             = [JournalEntry.note.icontains(k)]
-        date: dt.datetime
+        journal_entry_date: datetime
         try:
-            date = dt.datetime.strptime(k, "%Y")
+            journal_entry_date = datetime.strptime(k, "%Y")
             conditions.append(
-                sa.extract("year", JournalEntry.date) == date.year)
+                be(sa.extract("year", JournalEntry.date)
+                   == journal_entry_date.year))
         except ValueError:
             pass
         try:
-            date = dt.datetime.strptime(k, "%Y/%m")
+            journal_entry_date = datetime.strptime(k, "%Y/%m")
             conditions.append(sa.and_(
-                sa.extract("year", JournalEntry.date) == date.year,
+                sa.extract("year", JournalEntry.date)
-                sa.extract("month", JournalEntry.date) == date.month))
+                == journal_entry_date.year,
+                sa.extract("month", JournalEntry.date)
+                == journal_entry_date.month))
         except ValueError:
             pass
         try:
-            date = dt.datetime.strptime(f"2000/{k}", "%Y/%m/%d")
+            journal_entry_date = datetime.strptime(f"2000/{k}", "%Y/%m/%d")
             conditions.append(sa.and_(
-                sa.extract("month", JournalEntry.date) == date.month,
+                sa.extract("month", JournalEntry.date)
-                sa.extract("day", JournalEntry.date) == date.day))
+                == journal_entry_date.month,
+                sa.extract("day", JournalEntry.date)
+                == journal_entry_date.day))
         except ValueError:
             pass
         try:
-            date = dt.datetime.strptime(k, "%Y/%m/%d")
+            journal_entry_date = datetime.strptime(k, "%Y/%m/%d")
             conditions.append(sa.and_(
-                sa.extract("year", JournalEntry.date) == date.year,
+                sa.extract("year", JournalEntry.date)
-                sa.extract("month", JournalEntry.date) == date.month,
+                == journal_entry_date.year,
-                sa.extract("day", JournalEntry.date) == date.day))
+                sa.extract("month", JournalEntry.date)
+                == journal_entry_date.month,
+                sa.extract("day", JournalEntry.date)
+                == journal_entry_date.day))
         except ValueError:
             pass
         return sa.select(JournalEntry.id).filter(sa.or_(*conditions))

src/accounting/report/reports/trial_balance.py

@@ -224,7 +224,7 @@ class TrialBalance(BaseReport):
         """
         rows: list[CSVRow] = [CSVRow(gettext("Account"), gettext("Debit"),
                                      gettext("Credit"))]
-        rows.extend([CSVRow(str(x.account), x.debit, x.credit)
+        rows.extend([CSVRow(str(x.account).title(), x.debit, x.credit)
                      for x in self.__accounts])
         rows.append(CSVRow(gettext("Total"), self.__total.debit,
                            self.__total.credit))

src/accounting/report/reports/unapplied.py

@@ -17,31 +17,30 @@
 """The unapplied original line items.
 
 """
-import datetime as dt
+from datetime import date
 from decimal import Decimal
 
 from flask import render_template, Response
-from sqlalchemy.orm import selectinload
 
 from accounting.locale import gettext
-from accounting.models import Currency, Account, JournalEntry, \
+from accounting.models import Account, JournalEntryLineItem
-    JournalEntryLineItem
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download
 from accounting.report.utils.option_link import OptionLink
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
-from accounting.report.utils.unapplied import get_accounts_with_unapplied, \
+from accounting.report.utils.unapplied import get_accounts_with_unapplied
-    get_net_balances
 from accounting.report.utils.urls import unapplied_url
+from accounting.utils.offset_matcher import OffsetMatcher
 from accounting.utils.pagination import Pagination
+from accounting.utils.permission import can_edit
 
 
 class CSVRow(BaseCSVRow):
     """A row in the CSV."""
 
-    def __init__(self, journal_entry_date: str | dt.date, currency: str,
+    def __init__(self, journal_entry_date: str | date, currency: str,
                  description: str | None, amount: str | Decimal,
                  net_balance: str | Decimal):
         """Constructs a row in the CSV.
@@ -52,7 +51,7 @@ class CSVRow(BaseCSVRow):
         :param amount: The amount.
         :param net_balance: The net balance.
         """
-        self.date: str | dt.date = journal_entry_date
+        self.date: str | date = journal_entry_date
         """The date."""
         self.currency: str = currency
         """The currency."""
@@ -64,7 +63,7 @@ class CSVRow(BaseCSVRow):
         """The net balance."""
 
     @property
-    def values(self) -> list[str | dt.date | Decimal | None]:
+    def values(self) -> list[str | date | Decimal | None]:
         """Returns the values of the row.
 
         :return: The values of the row.
@@ -76,25 +75,25 @@ class CSVRow(BaseCSVRow):
 class PageParams(BasePageParams):
     """The HTML page parameters."""
 
-    def __init__(self, currency: Currency,
+    def __init__(self, account: Account,
-                 account: Account,
+                 is_mark_matches: bool,
                  pagination: Pagination[JournalEntryLineItem],
                  line_items: list[JournalEntryLineItem]):
         """Constructs the HTML page parameters.
 
-        :param currency: The currency.
         :param account: The account.
+        :param is_mark_matches: Whether to mark the matched offsets.
         :param pagination: The pagination.
         :param line_items: The line items.
         """
-        self.currency: Currency = currency
-        """The currency."""
         self.account: Account = account
         """The account."""
         self.pagination: Pagination[JournalEntryLineItem] = pagination
         """The pagination."""
         self.line_items: list[JournalEntryLineItem] = line_items
         """The line items."""
+        self.is_mark_matches: bool = is_mark_matches
+        """Whether to mark the matched offsets."""
 
     @property
     def has_data(self) -> bool:
@@ -110,32 +109,22 @@ class PageParams(BasePageParams):
 
         :return: The report chooser.
         """
-        return ReportChooser(ReportType.UNAPPLIED, currency=self.currency,
+        return ReportChooser(ReportType.UNAPPLIED,
                              account=self.account)
 
-    @property
-    def currency_options(self) -> list[OptionLink]:
-        """Returns the currency options.
-
-        :return: The currency options.
-        """
-        return self._get_currency_options(
-            lambda x: unapplied_url(x, self.account), self.currency)
-
     @property
     def account_options(self) -> list[OptionLink]:
         """Returns the account options.
 
         :return: The account options.
         """
-        options: list[OptionLink] \
+        options: list[OptionLink] = [OptionLink(gettext("Accounts"),
-            = [OptionLink(gettext("Accounts"),
+                                                unapplied_url(None),
-                          unapplied_url(self.currency, None),
+                                                False)]
-                          False)]
+        options.extend([OptionLink(str(x),
-        options.extend(
+                                   unapplied_url(x),
-            [OptionLink(str(x), unapplied_url(self.currency, x),
+                                   x.id == self.account.id)
-                        x.id == self.account.id)
+                        for x in get_accounts_with_unapplied()])
-             for x in get_accounts_with_unapplied(self.currency)])
         return options
 
 
@@ -157,47 +146,27 @@ def get_csv_rows(line_items: list[JournalEntryLineItem]) -> list[CSVRow]:
 class UnappliedOriginalLineItems(BaseReport):
     """The unapplied original line items."""
 
-    def __init__(self, currency: Currency, account: Account):
+    def __init__(self, account: Account):
         """Constructs the unapplied original line items.
 
-        :param currency: The currency.
         :param account: The account.
         """
-        self.__currency: Currency = currency
-        """The currency."""
         self.__account: Account = account
         """The account."""
+        offset_matcher: OffsetMatcher = OffsetMatcher(self.__account)
         self.__line_items: list[JournalEntryLineItem] \
-            = self.__query_line_items()
+            = offset_matcher.unapplied
         """The line items."""
-
+        self.__is_mark_matches: bool \
-    def __query_line_items(self) -> list[JournalEntryLineItem]:
+            = can_edit() and len(offset_matcher.unmatched_offsets) > 0
-        """Queries and returns the line items.
+        """Whether to mark the matched offsets."""
-
-        :return: The line items.
-        """
-        net_balances: dict[int, Decimal | None] \
-            = get_net_balances(self.__currency, self.__account)
-        line_items: list[JournalEntryLineItem] = JournalEntryLineItem.query \
-            .join(Account).join(JournalEntry) \
-            .filter(JournalEntryLineItem.id.in_(net_balances)) \
-            .order_by(JournalEntry.date, JournalEntry.no,
-                      JournalEntryLineItem.is_debit, JournalEntryLineItem.no) \
-            .options(selectinload(JournalEntryLineItem.currency),
-                     selectinload(JournalEntryLineItem.journal_entry)).all()
-        for line_item in line_items:
-            line_item.net_balance = line_item.amount \
-                if net_balances[line_item.id] is None \
-                else net_balances[line_item.id]
-        return line_items
 
     def csv(self) -> Response:
         """Returns the report as CSV for download.
 
         :return: The response of the report for download.
         """
-        filename: str = "unapplied-{currency}-{account}.csv"\
+        filename: str = f"unapplied-{self.__account.code}.csv"
-            .format(currency=self.__currency.code, account=self.__account.code)
         return csv_download(filename, get_csv_rows(self.__line_items))
 
     def html(self) -> str:
@@ -208,8 +177,8 @@ class UnappliedOriginalLineItems(BaseReport):
         pagination: Pagination[JournalEntryLineItem] \
             = Pagination[JournalEntryLineItem](self.__line_items,
                                                is_reversed=True)
-        params: PageParams = PageParams(currency=self.__currency,
+        params: PageParams = PageParams(account=self.__account,
-                                        account=self.__account,
+                                        is_mark_matches=self.__is_mark_matches,
                                         pagination=pagination,
                                         line_items=pagination.list)
         return render_template("accounting/report/unapplied.html",

src/accounting/report/reports/unapplied_accounts.py

@@ -17,13 +17,13 @@
 """The accounts with unapplied original line items.
 
 """
-import datetime as dt
+from datetime import date
 from decimal import Decimal
 
 from flask import render_template, Response
 
 from accounting.locale import gettext
-from accounting.models import Currency, Account
+from accounting.models import Account
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download
@@ -49,7 +49,7 @@ class CSVRow(BaseCSVRow):
         """The number of unapplied original line items."""
 
     @property
-    def values(self) -> list[str | dt.date | Decimal | None]:
+    def values(self) -> list[str | date | Decimal | None]:
         """Returns the values of the row.
 
         :return: The values of the row.
@@ -60,14 +60,11 @@ class CSVRow(BaseCSVRow):
 class PageParams(BasePageParams):
     """The HTML page parameters."""
 
-    def __init__(self, currency: Currency, accounts: list[Account]):
+    def __init__(self, accounts: list[Account]):
         """Constructs the HTML page parameters.
 
-        :param currency: The currency.
         :param accounts: The accounts.
         """
-        self.currency: Currency = currency
-        """The currency."""
         self.accounts: list[Account] = accounts
         """The accounts."""
 
@@ -85,17 +82,7 @@ class PageParams(BasePageParams):
 
         :return: The report chooser.
         """
-        return ReportChooser(ReportType.UNAPPLIED, currency=self.currency,
+        return ReportChooser(ReportType.UNAPPLIED)
-                             account=None)
-
-    @property
-    def currency_options(self) -> list[OptionLink]:
-        """Returns the currency options.
-
-        :return: The currency options.
-        """
-        return self._get_currency_options(lambda x: unapplied_url(x, None),
-                                          self.currency)
 
     @property
     def account_options(self) -> list[OptionLink]:
@@ -103,13 +90,13 @@ class PageParams(BasePageParams):
 
         :return: The account options.
         """
-        options: list[OptionLink] \
+        options: list[OptionLink] = [OptionLink(gettext("Accounts"),
-            = [OptionLink(gettext("Accounts"),
+                                                unapplied_url(None),
-                          unapplied_url(self.currency, None),
+                                                True)]
-                          True)]
+        options.extend([OptionLink(str(x),
-        options.extend(
+                                   unapplied_url(x),
-            [OptionLink(str(x), unapplied_url(self.currency, x), False)
+                                   False)
-             for x in self.accounts])
+                        for x in self.accounts])
         return options
 
 
@@ -120,21 +107,17 @@ def get_csv_rows(accounts: list[Account]) -> list[CSVRow]:
     :return: The CSV rows.
     """
     rows: list[CSVRow] = [CSVRow(gettext("Account"), gettext("Count"))]
-    rows.extend([CSVRow(str(x), x.count) for x in accounts])
+    rows.extend([CSVRow(str(x).title(), x.count)
+                 for x in accounts])
     return rows
 
 
 class AccountsWithUnappliedOriginalLineItems(BaseReport):
     """The accounts with unapplied original line items."""
 
-    def __init__(self, currency: Currency):
+    def __init__(self):
-        """Constructs the outstanding balances.
+        """Constructs the outstanding balances."""
-
+        self.__accounts: list[Account] = get_accounts_with_unapplied()
-        :param currency: The currency.
-        """
-        self.__currency: Currency = currency
-        """The currency."""
-        self.__accounts: list[Account] = get_accounts_with_unapplied(currency)
         """The accounts."""
 
     def csv(self) -> Response:
@@ -142,7 +125,7 @@ class AccountsWithUnappliedOriginalLineItems(BaseReport):
 
         :return: The response of the report for download.
         """
-        filename: str = "unapplied-accounts.csv"
+        filename: str = f"unapplied-accounts.csv"
         return csv_download(filename, get_csv_rows(self.__accounts))
 
     def html(self) -> str:
@@ -151,5 +134,4 @@ class AccountsWithUnappliedOriginalLineItems(BaseReport):
         :return: The report as HTML.
         """
         return render_template("accounting/report/unapplied-accounts.html",
-                               report=PageParams(currency=self.__currency,
+                               report=PageParams(accounts=self.__accounts))
-                                                 accounts=self.__accounts))

src/accounting/report/reports/unmatched.py

@@ -1,214 +0,0 @@
-# The Mia! Accounting Project.
-# Author: imacat@mail.imacat.idv.tw (imacat), 2023/4/17
-
-#  Copyright (c) 2023 imacat.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  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 unmatched offsets.
-
-"""
-import datetime as dt
-from decimal import Decimal
-
-from flask import render_template, Response
-from flask_babel import LazyString
-
-from accounting.locale import gettext
-from accounting.models import Currency, Account, JournalEntryLineItem
-from accounting.report.utils.base_page_params import BasePageParams
-from accounting.report.utils.base_report import BaseReport
-from accounting.report.utils.csv_export import BaseCSVRow, csv_download
-from accounting.report.utils.offset_matcher import OffsetMatcher, OffsetPair
-from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.report_chooser import ReportChooser
-from accounting.report.utils.report_type import ReportType
-from accounting.report.utils.unmatched import get_accounts_with_unmatched
-from accounting.report.utils.urls import unmatched_url
-from accounting.utils.pagination import Pagination
-
-
-class CSVRow(BaseCSVRow):
-    """A row in the CSV."""
-
-    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.
-
-        :param journal_entry_date: The journal entry date.
-        :param currency: The currency.
-        :param description: The description.
-        :param debit: The debit amount.
-        :param credit: The credit amount.
-        :param balance: The balance.
-        """
-        self.date: str | dt.date = journal_entry_date
-        """The date."""
-        self.currency: str = currency
-        """The currency."""
-        self.description: str | None = description
-        """The description."""
-        self.debit: str | Decimal | None = debit
-        """The debit amount."""
-        self.credit: str | Decimal | None = credit
-        """The credit amount."""
-        self.balance: str | Decimal = balance
-        """The balance."""
-
-    @property
-    def values(self) -> list[str | dt.date | Decimal | None]:
-        """Returns the values of the row.
-
-        :return: The values of the row.
-        """
-        return [self.date, self.currency, self.description, self.debit,
-                self.credit, self.balance]
-
-
-class PageParams(BasePageParams):
-    """The HTML page parameters."""
-
-    def __init__(self, currency: Currency,
-                 account: Account,
-                 match_status: str | LazyString,
-                 matched_pairs: list[OffsetPair],
-                 pagination: Pagination[JournalEntryLineItem],
-                 line_items: list[JournalEntryLineItem]):
-        """Constructs the HTML page parameters.
-
-        :param currency: The currency.
-        :param account: The account.
-        :param match_status: The match status message.
-        :param matched_pairs: A list of matched pairs.
-        :param pagination: The pagination.
-        :param line_items: The line items.
-        """
-        self.currency: Currency = currency
-        """The currency."""
-        self.account: Account = account
-        """The account."""
-        self.match_status: str | LazyString = match_status
-        """The match status message."""
-        self.matched_pairs: list[OffsetPair] = matched_pairs
-        """A list of matched pairs."""
-        self.pagination: Pagination[JournalEntryLineItem] = pagination
-        """The pagination."""
-        self.line_items: list[JournalEntryLineItem] = line_items
-        """The line items."""
-
-    @property
-    def has_data(self) -> bool:
-        """Returns whether there is any data on the page.
-
-        :return: True if there is any data, or False otherwise.
-        """
-        return len(self.line_items) > 0
-
-    @property
-    def report_chooser(self) -> ReportChooser:
-        """Returns the report chooser.
-
-        :return: The report chooser.
-        """
-        return ReportChooser(ReportType.UNMATCHED, currency=self.currency,
-                             account=self.account)
-
-    @property
-    def currency_options(self) -> list[OptionLink]:
-        """Returns the currency options.
-
-        :return: The currency options.
-        """
-        return self._get_currency_options(
-            lambda x: unmatched_url(x, self.account), self.currency)
-
-    @property
-    def account_options(self) -> list[OptionLink]:
-        """Returns the account options.
-
-        :return: The account options.
-        """
-        options: list[OptionLink] \
-            = [OptionLink(gettext("Accounts"),
-                          unmatched_url(self.currency, None),
-                          False)]
-        options.extend(
-            [OptionLink(str(x), unmatched_url(self.currency, x),
-                        x.id == self.account.id)
-             for x in get_accounts_with_unmatched(self.currency)])
-        return options
-
-
-def get_csv_rows(line_items: list[JournalEntryLineItem]) -> list[CSVRow]:
-    """Composes and returns the CSV rows from the line items.
-
-    :param line_items: The line items.
-    :return: The CSV rows.
-    """
-    rows: list[CSVRow] = [CSVRow(gettext("Date"), gettext("Currency"),
-                                 gettext("Description"), gettext("Debit"),
-                                 gettext("Credit"), gettext("Balance"))]
-    rows.extend([CSVRow(x.journal_entry.date, x.currency.code,
-                        x.description, x.debit, x.credit, x.balance)
-                 for x in line_items])
-    return rows
-
-
-class UnmatchedOffsets(BaseReport):
-    """The unmatched offsets."""
-
-    def __init__(self, currency: Currency, account: Account):
-        """Constructs the unmatched offsets.
-
-        :param currency: The currency.
-        :param account: The account.
-        """
-        self.__currency: Currency = currency
-        """The currency."""
-        self.__account: Account = account
-        """The account."""
-        offset_matcher: OffsetMatcher \
-            = OffsetMatcher(self.__currency, self.__account)
-        self.__line_items: list[JournalEntryLineItem] \
-            = offset_matcher.line_items
-        """The line items."""
-        self.__match_status: str | LazyString = offset_matcher.status
-        """The match status message."""
-        self.__matched_pairs: list[OffsetPair] = offset_matcher.matched_pairs
-        """A list of matched pairs."""
-
-    def csv(self) -> Response:
-        """Returns the report as CSV for download.
-
-        :return: The response of the report for download.
-        """
-        filename: str = "unmatched-{currency}-{account}.csv"\
-            .format(currency=self.__currency.code, account=self.__account.code)
-        return csv_download(filename, get_csv_rows(self.__line_items))
-
-    def html(self) -> str:
-        """Composes and returns the report as HTML.
-
-        :return: The report as HTML.
-        """
-        pagination: Pagination[JournalEntryLineItem] \
-            = Pagination[JournalEntryLineItem](self.__line_items,
-                                               is_reversed=True)
-        params: PageParams = PageParams(currency=self.__currency,
-                                        account=self.__account,
-                                        match_status=self.__match_status,
-                                        matched_pairs=self.__matched_pairs,
-                                        pagination=pagination,
-                                        line_items=pagination.list)
-        return render_template("accounting/report/unmatched.html",
-                               report=params)

src/accounting/report/reports/unmatched_accounts.py

@@ -1,156 +0,0 @@
-# The Mia! Accounting Project.
-# Author: imacat@mail.imacat.idv.tw (imacat), 2023/4/17
-
-#  Copyright (c) 2023 imacat.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  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 accounts with unmatched offsets.
-
-"""
-import datetime as dt
-from decimal import Decimal
-
-from flask import render_template, Response
-
-from accounting.locale import gettext
-from accounting.models import Currency, Account
-from accounting.report.utils.base_page_params import BasePageParams
-from accounting.report.utils.base_report import BaseReport
-from accounting.report.utils.csv_export import BaseCSVRow, csv_download
-from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.report_chooser import ReportChooser
-from accounting.report.utils.report_type import ReportType
-from accounting.report.utils.unmatched import get_accounts_with_unmatched
-from accounting.report.utils.urls import unmatched_url
-
-
-class CSVRow(BaseCSVRow):
-    """A row in the CSV."""
-
-    def __init__(self, account: str, count: int | str):
-        """Constructs a row in the CSV.
-
-        :param account: The account.
-        :param count: The number of unapplied original line items.
-        """
-        self.account: str = account
-        """The currency."""
-        self.count: int | str = count
-        """The number of unapplied original line items."""
-
-    @property
-    def values(self) -> list[str | dt.date | Decimal | None]:
-        """Returns the values of the row.
-
-        :return: The values of the row.
-        """
-        return [self.account, self.count]
-
-
-class PageParams(BasePageParams):
-    """The HTML page parameters."""
-
-    def __init__(self, currency: Currency, accounts: list[Account]):
-        """Constructs the HTML page parameters.
-
-        :param currency: The currency.
-        :param accounts: The accounts.
-        """
-        self.currency: Currency = currency
-        """The currency."""
-        self.accounts: list[Account] = accounts
-        """The accounts."""
-
-    @property
-    def has_data(self) -> bool:
-        """Returns whether there is any data on the page.
-
-        :return: True if there is any data, or False otherwise.
-        """
-        return len(self.accounts) > 0
-
-    @property
-    def report_chooser(self) -> ReportChooser:
-        """Returns the report chooser.
-
-        :return: The report chooser.
-        """
-        return ReportChooser(ReportType.UNMATCHED, currency=self.currency,
-                             account=None)
-
-    @property
-    def currency_options(self) -> list[OptionLink]:
-        """Returns the currency options.
-
-        :return: The currency options.
-        """
-        return self._get_currency_options(lambda x: unmatched_url(x, None),
-                                          self.currency)
-
-    @property
-    def account_options(self) -> list[OptionLink]:
-        """Returns the account options.
-
-        :return: The account options.
-        """
-        options: list[OptionLink] \
-            = [OptionLink(gettext("Accounts"),
-                          unmatched_url(self.currency, None),
-                          True)]
-        options.extend(
-            [OptionLink(str(x), unmatched_url(self.currency, x), False)
-             for x in self.accounts])
-        return options
-
-
-def get_csv_rows(accounts: list[Account]) -> list[CSVRow]:
-    """Composes and returns the CSV rows from the line items.
-
-    :param accounts: The accounts.
-    :return: The CSV rows.
-    """
-    rows: list[CSVRow] = [CSVRow(gettext("Account"), gettext("Count"))]
-    rows.extend([CSVRow(str(x), x.count) for x in accounts])
-    return rows
-
-
-class AccountsWithUnmatchedOffsets(BaseReport):
-    """The accounts with unmatched offsets."""
-
-    def __init__(self, currency: Currency):
-        """Constructs the outstanding balances.
-
-        :param currency: The currency.
-        """
-        self.__currency: Currency = currency
-        """The currency."""
-        self.__accounts: list[Account] \
-            = get_accounts_with_unmatched(currency)
-        """The accounts."""
-
-    def csv(self) -> Response:
-        """Returns the report as CSV for download.
-
-        :return: The response of the report for download.
-        """
-        filename: str = "unmatched-accounts.csv"
-        return csv_download(filename, get_csv_rows(self.__accounts))
-
-    def html(self) -> str:
-        """Composes and returns the report as HTML.
-
-        :return: The report as HTML.
-        """
-        return render_template("accounting/report/unmatched-accounts.html",
-                               report=PageParams(currency=self.__currency,
-                                                 accounts=self.__accounts))

src/accounting/report/utils/base_page_params.py

@@ -17,9 +17,8 @@
 """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
 
@@ -53,7 +52,7 @@ class BasePageParams(ABC):
         """
 
     @property
-    def journal_entry_types(self) -> Type[JournalEntryType]:
+    def journal_entry_types(self) -> t.Type[JournalEntryType]:
         """Returns the journal entry types.
 
         :return: The journal entry types.
@@ -73,7 +72,7 @@ class BasePageParams(ABC):
         return urlunparse(parts)
 
     @staticmethod
-    def _get_currency_options(get_url: Callable[[Currency], str],
+    def _get_currency_options(get_url: t.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: dt.date | None) -> str | None:
+def __get_start_str(start: 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: dt.date | None) -> str | None:
     return start.strftime("%Y%m%d")
 
 
-def __get_end_str(end: dt.date | None) -> str | None:
+def __get_end_str(end: 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: dt.date | None) -> str | None:
         return None
     if end.month == 12 and end.day == 31:
         return str(end.year)
-    if (end + dt.timedelta(days=1)).day == 1:
+    if (end + timedelta(days=1)).day == 1:
         return end.strftime("%Y%m")
     return end.strftime("%Y%m%d")

src/accounting/report/utils/offset_matcher.py

@@ -1,178 +0,0 @@
-# The Mia! Accounting Project.
-# Author: imacat@mail.imacat.idv.tw (imacat), 2023/4/8
-
-#  Copyright (c) 2023 imacat.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  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 forms for the unmatched offset management.
-
-"""
-from decimal import Decimal
-
-import sqlalchemy as sa
-from flask_babel import LazyString
-from sqlalchemy.orm import selectinload
-
-from accounting.locale import lazy_gettext
-from accounting.models import Currency, Account, JournalEntry, \
-    JournalEntryLineItem
-from accounting.report.utils.unapplied import get_net_balances
-
-
-class OffsetPair:
-    """A pair of an original line item and its offset."""
-
-    def __init__(self, original_line_item: JournalEntryLineItem,
-                 offset: JournalEntryLineItem):
-        """Constructs a pair of an original line item and its offset.
-
-        :param original_line_item: The original line item.
-        :param offset: The offset.
-        """
-        self.original_line_item: JournalEntryLineItem = original_line_item
-        """The original line item."""
-        self.offset: JournalEntryLineItem = offset
-        """The offset."""
-
-
-class OffsetMatcher:
-    """The offset matcher."""
-
-    def __init__(self, currency: Currency, account: Account):
-        """Constructs the offset matcher.
-
-        :param currency: The currency.
-        :param account: The account.
-        """
-        self.__currency: Account = currency
-        """The currency."""
-        self.__account: Account = account
-        """The account."""
-        self.matched_pairs: list[OffsetPair] = []
-        """A list of matched pairs."""
-        self.line_items: list[JournalEntryLineItem] = []
-        """The unapplied debits or credits and unmatched offsets."""
-        self.unapplied: list[JournalEntryLineItem] = []
-        """The unapplied debits or credits."""
-        self.unmatched: list[JournalEntryLineItem] = []
-        """The unmatched offsets."""
-        self.__find_matches()
-
-    def __find_matches(self) -> None:
-        """Finds the matched original line items and their offsets.
-
-        :return: None.
-        """
-        self.__get_line_items()
-        if len(self.unapplied) == 0 or len(self.unmatched) == 0:
-            return
-        remains: list[JournalEntryLineItem] = self.unmatched.copy()
-        for original_item in self.unapplied:
-            offset_candidates: list[JournalEntryLineItem] \
-                = [x for x in remains
-                   if (x.journal_entry.date > original_item.journal_entry.date
-                       or (x.journal_entry.date
-                           == original_item.journal_entry.date
-                           and x.journal_entry.no
-                           > original_item.journal_entry.no))
-                   and x.currency_code == original_item.currency_code
-                   and x.description == original_item.description
-                   and x.amount == original_item.net_balance]
-            if len(offset_candidates) == 0:
-                continue
-            self.matched_pairs.append(
-                OffsetPair(original_item, offset_candidates[0]))
-            original_item.match = offset_candidates[0]
-            offset_candidates[0].match = original_item
-            remains.remove(offset_candidates[0])
-
-    def __get_line_items(self) -> None:
-        """Returns the unapplied original line items and unmatched offsets of
-        the account.
-
-        :return: The unapplied original line items and unmatched offsets of the
-            account.
-        """
-        net_balances: dict[int, Decimal | None] \
-            = get_net_balances(self.__currency, self.__account)
-        unmatched_offset_condition: sa.BinaryExpression \
-            = sa.and_(Account.id == self.__account.id,
-                      JournalEntryLineItem.currency_code
-                      == self.__currency.code,
-                      JournalEntryLineItem.original_line_item_id.is_(None),
-                      sa.or_(sa.and_(Account.base_code.startswith("2"),
-                                     JournalEntryLineItem.is_debit),
-                             sa.and_(Account.base_code.startswith("1"),
-                                     sa.not_(JournalEntryLineItem.is_debit))))
-        self.line_items = JournalEntryLineItem.query \
-            .join(Account).join(JournalEntry) \
-            .filter(sa.or_(JournalEntryLineItem.id.in_(net_balances),
-                           unmatched_offset_condition)) \
-            .order_by(JournalEntry.date, JournalEntry.no,
-                      JournalEntryLineItem.is_debit, JournalEntryLineItem.no) \
-            .options(selectinload(JournalEntryLineItem.currency),
-                     selectinload(JournalEntryLineItem.journal_entry)).all()
-        for line_item in self.line_items:
-            line_item.is_offset = line_item.id not in net_balances
-        self.unapplied = [x for x in self.line_items if not x.is_offset]
-        for line_item in self.unapplied:
-            line_item.net_balance = line_item.amount \
-                if net_balances[line_item.id] is None \
-                else net_balances[line_item.id]
-        self.unmatched = [x for x in self.line_items if x.is_offset]
-        self.__populate_accumulated_balances()
-
-    def __populate_accumulated_balances(self) -> None:
-        """Populates the accumulated balances of the line items.
-
-        :return: None.
-        """
-        balance: Decimal = Decimal("0")
-        for line_item in self.line_items:
-            amount: Decimal = line_item.amount if line_item.is_offset \
-                else line_item.net_balance
-            if line_item.is_debit:
-                line_item.debit = amount
-                line_item.credit = None
-                balance = balance + amount
-            else:
-                line_item.debit = None
-                line_item.credit = amount
-                balance = balance - amount
-            line_item.balance = balance
-
-    @property
-    def status(self) -> str | LazyString:
-        """Returns the match status message.
-
-        :return: The match status message.
-        """
-        if len(self.unmatched) == 0:
-            return lazy_gettext("There is no unmatched offset.")
-        if len(self.matched_pairs) == 0:
-            return lazy_gettext(
-                    "%(total)s unmatched offsets without original items.",
-                    total=len(self.unmatched))
-        return lazy_gettext(
-            "%(matches)s unmatched offsets out of %(total)s"
-            " can match with their original items.",
-            matches=len(self.matched_pairs),
-            total=len(self.unmatched))
-
-    def match(self) -> None:
-        """Matches the original line items with offsets.
-
-        :return: None.
-        """
-        for pair in self.matched_pairs:
-            pair.offset.original_line_item_id = pair.original_line_item.id

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
-from collections.abc import Iterator
+import typing as t
 
 from flask_babel import LazyString
 
@@ -31,12 +31,10 @@ from accounting.models import Currency, Account
 from accounting.report.period import Period, get_period
 from accounting.template_globals import default_currency_code
 from accounting.utils.current_account import CurrentAccount
-from accounting.utils.permission import can_edit
 from .option_link import OptionLink
 from .report_type import ReportType
 from .urls import journal_url, ledger_url, income_expenses_url, \
-    trial_balance_url, income_statement_url, balance_sheet_url, \
+    trial_balance_url, income_statement_url, balance_sheet_url, unapplied_url
-    unapplied_url, unmatched_url
 
 
 class ReportChooser:
@@ -77,8 +75,6 @@ class ReportChooser:
         self.__reports.append(self.__income_statement)
         self.__reports.append(self.__balance_sheet)
         self.__reports.append(self.__unapplied)
-        if can_edit():
-            self.__reports.append(self.__unmatched)
         for report in self.__reports:
             if report.is_active:
                 self.current_report = report.title
@@ -164,33 +160,16 @@ class ReportChooser:
         """
         account: Account = self.__account
         if not account.is_need_offset:
-            return OptionLink(gettext("Unapplied Items"),
+            return OptionLink(gettext("Unapplied Original Line Items"),
-                              unapplied_url(self.__currency, None),
+                              unapplied_url(None),
                               self.__active_report == ReportType.UNAPPLIED,
                               fa_icon="fa-solid fa-link-slash")
-        return OptionLink(gettext("Unapplied Items"),
+        return OptionLink(gettext("Unapplied Original Line Items"),
-                          unapplied_url(self.__currency, self.__account),
+                          unapplied_url(account),
                           self.__active_report == ReportType.UNAPPLIED,
                           fa_icon="fa-solid fa-link-slash")
 
-    @property
+    def __iter__(self) -> t.Iterator[OptionLink]:
-    def __unmatched(self) -> OptionLink:
-        """Returns the unmatched offsets.
-
-        :return: The unmatched offsets.
-        """
-        account: Account = self.__account
-        if not account.is_need_offset:
-            return OptionLink(gettext("Unmatched Offsets"),
-                              unmatched_url(self.__currency, None),
-                              self.__active_report == ReportType.UNMATCHED,
-                              fa_icon="fa-solid fa-file-circle-question")
-        return OptionLink(gettext("Unmatched Offsets"),
-                          unmatched_url(self.__currency, self.__account),
-                          self.__active_report == ReportType.UNMATCHED,
-                          fa_icon="fa-solid fa-file-circle-question")
-
-    def __iter__(self) -> Iterator[OptionLink]:
         """Returns the iteration of the reports.
 
         :return: The iteration of the reports.

src/accounting/report/utils/report_type.py

@@ -36,7 +36,5 @@ class ReportType(Enum):
     """The balance sheet."""
     UNAPPLIED: str = "unapplied"
     """The unapplied original line items."""
-    UNMATCHED: str = "unmatched"
-    """The unmatched offsets."""
     SEARCH: str = "search"
     """The search."""

src/accounting/report/utils/unapplied.py

@@ -17,37 +17,33 @@
 """The unapplied original line item utilities.
 
 """
-from decimal import Decimal
-
 import sqlalchemy as sa
 
 from accounting import db
-from accounting.models import Currency, Account, JournalEntry, \
+from accounting.models import Account, JournalEntryLineItem
-    JournalEntryLineItem
+from accounting.utils.cast import be
 from accounting.utils.offset_alias import offset_alias
 
 
-def get_accounts_with_unapplied(currency: Currency) -> list[Account]:
+def get_accounts_with_unapplied() -> list[Account]:
     """Returns the accounts with unapplied original line items.
 
-    :param currency: The currency.
     :return: The accounts with unapplied original line items.
     """
     offset: sa.Alias = offset_alias()
     net_balance: sa.Label \
         = (JournalEntryLineItem.amount
            + sa.func.sum(sa.case(
-                (offset.c.is_debit == JournalEntryLineItem.is_debit,
+                (be(offset.c.is_debit == JournalEntryLineItem.is_debit),
                  offset.c.amount),
                 else_=-offset.c.amount))).label("net_balance")
     select_unapplied: sa.Select \
         = sa.select(JournalEntryLineItem.id)\
-        .join(JournalEntry).join(Account)\
+        .join(Account)\
-        .join(offset,
+        .join(offset, be(JournalEntryLineItem.id
-              JournalEntryLineItem.id == offset.c.original_line_item_id,
+                         == offset.c.original_line_item_id),
               isouter=True)\
         .filter(Account.is_need_offset,
-                JournalEntryLineItem.currency_code == currency.code,
                 sa.or_(sa.and_(Account.base_code.startswith("2"),
                                sa.not_(JournalEntryLineItem.is_debit)),
                        sa.and_(Account.base_code.startswith("1"),
@@ -69,36 +65,3 @@ def get_accounts_with_unapplied(currency: Currency) -> list[Account]:
     for account in accounts:
         account.count = counts[account.id]
     return accounts
-
-
-def get_net_balances(currency: Currency, account: Account) \
-        -> dict[int, Decimal | None]:
-    """Returns the net balances of the unapplied line items of the account.
-
-    :param currency: The currency.
-    :param account: The account.
-    :return: The net balances of the unapplied line items of the account.
-    """
-    offset: sa.Alias = offset_alias()
-    net_balance: sa.Label \
-        = (JournalEntryLineItem.amount
-           + sa.func.sum(sa.case(
-                (offset.c.is_debit == JournalEntryLineItem.is_debit,
-                 offset.c.amount),
-                else_=-offset.c.amount))).label("net_balance")
-    select_net_balances: sa.Select \
-        = sa.select(JournalEntryLineItem.id, net_balance) \
-        .join(JournalEntry).join(Account) \
-        .join(offset,
-              JournalEntryLineItem.id == offset.c.original_line_item_id,
-              isouter=True) \
-        .filter(Account.id == account.id,
-                JournalEntryLineItem.currency_code == currency.code,
-                sa.or_(sa.and_(Account.base_code.startswith("2"),
-                               sa.not_(JournalEntryLineItem.is_debit)),
-                       sa.and_(Account.base_code.startswith("1"),
-                               JournalEntryLineItem.is_debit))) \
-        .group_by(JournalEntryLineItem.id) \
-        .having(sa.or_(sa.func.count(offset.c.id) == 0, net_balance != 0))
-    return {x.id: x.net_balance
-            for x in db.session.execute(select_net_balances).all()}

src/accounting/report/utils/urls.py

@@ -113,35 +113,13 @@ def balance_sheet_url(currency: Currency, period: Period) -> str:
                    currency=currency, period=period)
 
 
-def unapplied_url(currency: Currency, account: Account | None) -> str:
+def unapplied_url(account: Account | None) -> str:
     """Returns the URL of the unapplied original line items.
 
-    :param currency: The currency.
     :param account: The account, or None to list the accounts with unapplied
         original line items.
     :return: The URL of the unapplied original line items.
     """
     if account is None:
-        if currency.code == default_currency_code():
+        return url_for("accounting-report.unapplied-default")
-            return url_for("accounting-report.unapplied-accounts-default")
+    return url_for("accounting-report.unapplied", account=account)
-        return url_for("accounting-report.unapplied-accounts",
-                       currency=currency)
-    return url_for("accounting-report.unapplied",
-                   currency=currency, account=account)
-
-
-def unmatched_url(currency: Currency, account: Account | None) -> str:
-    """Returns the URL of the unmatched offset line items.
-
-    :param currency: The currency.
-    :param account: The account, or None to list the accounts with unmatched
-        offset line items.
-    :return: The URL of the unmatched offset line items.
-    """
-    if account is None:
-        if currency.code == default_currency_code():
-            return url_for("accounting-report.unmatched-accounts-default")
-        return url_for("accounting-report.unmatched-accounts",
-                       currency=currency)
-    return url_for("accounting-report.unmatched",
-                   currency=currency, account=account)

src/accounting/report/views.py

@@ -17,27 +17,20 @@
 """The views for the report management.
 
 """
-from flask import Blueprint, request, Response, redirect, flash
+from flask import Blueprint, request, Response
 
 from accounting import db
-from accounting.locale import lazy_gettext
 from accounting.models import Currency, Account
+from accounting.report.period import Period, get_period
 from accounting.template_globals import default_currency_code
-from accounting.utils.cast import s
 from accounting.utils.current_account import CurrentAccount
-from accounting.utils.next_uri import or_next
 from accounting.utils.options import options
-from accounting.utils.permission import has_permission, can_view, can_edit
+from accounting.utils.permission import has_permission, can_view
-from .period import Period, get_period
 from .reports import Journal, Ledger, IncomeExpenses, TrialBalance, \
     IncomeStatement, BalanceSheet, Search
 from .reports.unapplied import UnappliedOriginalLineItems
 from .reports.unapplied_accounts import AccountsWithUnappliedOriginalLineItems
-from .reports.unmatched import UnmatchedOffsets
-from .reports.unmatched_accounts import AccountsWithUnmatchedOffsets
 from .template_filters import format_amount
-from .utils.offset_matcher import OffsetMatcher
-from .utils.urls import unmatched_url
 
 bp: Blueprint = Blueprint("accounting-report", __name__)
 """The view blueprint for the reports."""
@@ -285,130 +278,34 @@ def __get_balance_sheet(currency: Currency, period: Period) \
     return report.html()
 
 
-@bp.get("unapplied", endpoint="unapplied-accounts-default")
+@bp.get("unapplied", endpoint="unapplied-default")
 @has_permission(can_view)
-def get_default_unapplied_accounts() -> str | Response:
+def get_default_unapplied() -> str | Response:
     """Returns the accounts with unapplied original line items.
 
-    :return: The accounts with unapplied original line items.
-    """
-    return __get_unapplied_accounts(
-        db.session.get(Currency, default_currency_code()))
-
-
-@bp.get("unapplied/<currency:currency>", endpoint="unapplied-accounts")
-@has_permission(can_view)
-def get_unapplied_accounts(currency: Currency) -> str | Response:
-    """Returns the accounts with unapplied original line items.
-
-    :param currency: The currency.
-    :return: The accounts with unapplied original line items.
-    """
-    return __get_unapplied_accounts(currency)
-
-
-def __get_unapplied_accounts(currency: Currency) -> str | Response:
-    """Returns the accounts with unapplied original line items.
-
-    :param currency: The currency.
     :return: The accounts with unapplied original line items.
     """
     report: AccountsWithUnappliedOriginalLineItems \
-        = AccountsWithUnappliedOriginalLineItems(currency)
+        = AccountsWithUnappliedOriginalLineItems()
     if "as" in request.args and request.args["as"] == "csv":
         return report.csv()
     return report.html()
 
 
-@bp.get("unapplied/<currency:currency>/<needOffsetAccount:account>",
+@bp.get("unapplied/<needOffsetAccount:account>", endpoint="unapplied")
-        endpoint="unapplied")
 @has_permission(can_view)
-def get_unapplied(currency: Currency, account: Account) -> str | Response:
+def get_unapplied(account: Account) -> str | Response:
     """Returns the unapplied original line items.
 
-    :param currency: The currency.
     :param account: The Account.
-    :return: The unapplied original line items in the period.
+    :return: The unapplied original line items.
     """
-    report: UnappliedOriginalLineItems \
+    report: UnappliedOriginalLineItems = UnappliedOriginalLineItems(account)
-        = UnappliedOriginalLineItems(currency, account)
     if "as" in request.args and request.args["as"] == "csv":
         return report.csv()
     return report.html()
 
 
-@bp.get("unmatched", endpoint="unmatched-accounts-default")
-@has_permission(can_edit)
-def get_default_unmatched_accounts() -> str | Response:
-    """Returns the accounts with unmatched offsets.
-
-    :return: The accounts with unmatched offsets.
-    """
-    return __get_unmatched_accounts(
-        db.session.get(Currency, default_currency_code()))
-
-
-@bp.get("unmatched/<currency:currency>", endpoint="unmatched-accounts")
-@has_permission(can_edit)
-def get_unmatched_accounts(currency: Currency) -> str | Response:
-    """Returns the accounts with unmatched offsets.
-
-    :param currency: The currency.
-    :return: The accounts with unmatched offsets.
-    """
-    return __get_unmatched_accounts(currency)
-
-
-def __get_unmatched_accounts(currency: Currency) -> str | Response:
-    """Returns the accounts with unmatched offsets.
-
-    :param currency: The currency.
-    :return: The accounts with unmatched offsets.
-    """
-    report: AccountsWithUnmatchedOffsets \
-        = AccountsWithUnmatchedOffsets(currency)
-    if "as" in request.args and request.args["as"] == "csv":
-        return report.csv()
-    return report.html()
-
-
-@bp.get("unmatched/<currency:currency>/<needOffsetAccount:account>",
-        endpoint="unmatched")
-@has_permission(can_edit)
-def get_unmatched(currency: Currency, account: Account) -> str | Response:
-    """Returns the unmatched offsets.
-
-    :param currency: The currency.
-    :param account: The Account.
-    :return: The unmatched offsets in the period.
-    """
-    report: UnmatchedOffsets = UnmatchedOffsets(currency, account)
-    if "as" in request.args and request.args["as"] == "csv":
-        return report.csv()
-    return report.html()
-
-
-@bp.post("match-offsets/<currency:currency>/<needOffsetAccount:account>",
-         endpoint="match-offsets")
-@has_permission(can_edit)
-def match_offsets(currency: Currency, account: Account) -> redirect:
-    """Matches the original line items with their offsets.
-
-    :return: Redirection to the view of the unmatched offsets.
-    """
-    matcher: OffsetMatcher = OffsetMatcher(currency, account)
-    if len(matcher.matched_pairs) == 0:
-        flash(s(lazy_gettext("No more offset to match automatically.")),
-              "success")
-        return redirect(or_next(
-            unmatched_url(currency, account)))
-    matcher.match()
-    db.session.commit()
-    flash(s(lazy_gettext("Matched %(matches)s offsets.",
-                         matches=len(matcher.matched_pairs))), "success")
-    return redirect(or_next(unmatched_url(currency, account)))
-
-
 @bp.get("search", endpoint="search")
 @has_permission(can_view)
 def search() -> str | Response:

src/accounting/static/css/style.css

@@ -39,10 +39,6 @@
 .accounting-toolbar {
     display: flex;
 }
-.accounting-toolbar-accounts {
-    max-height: 20rem;
-    overflow-y: scroll;
-}
 .accounting-toolbar .input-group > .input-group-text {
     padding: 0;
     background-color: transparent;
@@ -326,7 +322,7 @@ a.accounting-report-table-row {
     font-style: italic;
 }
 .accounting-unapplied-table .accounting-report-table-row {
-    grid-template-columns: 1fr 5fr 1fr 1fr;
+    grid-template-columns: 1fr 1fr 5fr 1fr 1fr;
 }
 .accounting-unapplied-account-table .accounting-report-table-row {
     display: flex;
@@ -335,16 +331,6 @@ a.accounting-report-table-row {
 .accounting-unapplied-account-table .accounting-report-table-header .accounting-report-table-row {
     display: block;
 }
-.accounting-unmatched-table .accounting-report-table-row {
-    grid-template-columns: 1fr 5fr 1fr 1fr 1fr;
-}
-.accounting-unmatched-account-table .accounting-report-table-row {
-    display: flex;
-    justify-content: space-between;
-}
-.accounting-unmatched-account-table .accounting-report-table-header .accounting-report-table-row {
-    display: block;
-}
 
 /* The accounting report */
 .accounting-mobile-journal-credit {

src/accounting/static/js/description-editor.js

@@ -364,13 +364,12 @@ class DescriptionEditorAccount extends JournalEntryAccount {
      *
      * @param editor {DescriptionEditor} the description editor
      * @param code {string} the account code
-     * @param title {string} the account title
      * @param text {string} the account text
      * @param isNeedOffset {boolean} true if the line items in the account needs offset, or false otherwise
      * @param button {HTMLButtonElement} the account button
      */
-    constructor(editor, code, title, text, isNeedOffset, button) {
+    constructor(editor, code, text, isNeedOffset, button) {
-        super(code, title, text, isNeedOffset);
+        super(code, text, isNeedOffset);
         this.#element = button;
         this.#element.onclick = () => editor.selectAccount(this);
     }
@@ -425,7 +424,7 @@ class DescriptionEditorSuggestedAccount extends DescriptionEditorAccount {
      * @param button {HTMLButtonElement} the account button
      */
     constructor(editor, button) {
-        super(editor, button.dataset.code, button.dataset.title, button.dataset.text, button.classList.contains("accounting-account-is-need-offset"), button);
+        super(editor, button.dataset.code, button.dataset.text, button.classList.contains("accounting-account-is-need-offset"), button);
     }
 }
 
@@ -442,7 +441,7 @@ class DescriptionEditorConfirmedAccount extends DescriptionEditorAccount {
      * @param button {HTMLButtonElement} the account button
      */
     constructor(editor, button) {
-        super(editor, "", "", "", false, button);
+        super(editor, "", "", false, button);
         this.isConfirmedAccount = true;
     }
 

src/accounting/static/js/journal-entry-account-selector.js

@@ -202,12 +202,6 @@ class JournalEntryAccountOption {
      */
     code;
 
-    /**
-     * The account title
-     * @type {string}
-     */
-    title;
-
     /**
      * The account text
      * @type {string}
@@ -241,7 +235,6 @@ class JournalEntryAccountOption {
     constructor(selector, element) {
         this.#element = element;
         this.code = element.dataset.code;
-        this.title = element.dataset.title;
         this.text = element.dataset.text;
         this.#isInUse = element.classList.contains("accounting-account-is-in-use");
         this.isNeedOffset = element.classList.contains("accounting-account-is-need-offset");

src/accounting/static/js/journal-entry-form.js

@@ -791,12 +791,6 @@ class JournalEntryAccount {
      */
     code;
 
-    /**
-     * The account title
-     * @type {string}
-     */
-    title;
-
     /**
      * The account text
      * @type {string}
@@ -813,13 +807,11 @@ class JournalEntryAccount {
      * Constructs a journal entry account.
      *
      * @param code {string} the account code
-     * @param title {string} the account title
      * @param text {string} the account text
      * @param isNeedOffset {boolean} true if the line items in the account needs offset, or false otherwise
      */
-    constructor(code, title, text, isNeedOffset) {
+    constructor(code, text, isNeedOffset) {
         this.code = code;
-        this.title = title;
         this.text = text;
         this.isNeedOffset = isNeedOffset;
     }
@@ -830,7 +822,7 @@ class JournalEntryAccount {
      * @return {JournalEntryAccount} the copy of the account
      */
     copy() {
-        return new JournalEntryAccount(this.code, this.title, this.text, this.isNeedOffset);
+        return new JournalEntryAccount(this.code, this.text, this.isNeedOffset);
     }
 }
 
@@ -895,16 +887,10 @@ class LineItemSubForm {
     #accountCode;
 
     /**
-     * The code part of the text display of the account
+     * The text display of the account
-     * @type {HTMLSpanElement}
+     * @type {HTMLDivElement}
      */
-    #accountTextCode;
+    #accountText;
-
-    /**
-     * The title part of the text display of the account
-     * @type {HTMLSpanElement}
-     */
-    #accountTextTitle;
 
     /**
      * The description
@@ -971,8 +957,7 @@ class LineItemSubForm {
         this.#error = document.getElementById(`${prefix}-error`);
         this.#no = document.getElementById(`${prefix}-no`);
         this.#accountCode = document.getElementById(`${prefix}-account-code`);
-        this.#accountTextCode = document.getElementById(`${prefix}-account-text-code`);
+        this.#accountText = document.getElementById(`${prefix}-account-text`);
-        this.#accountTextTitle = document.getElementById(`${prefix}-account-text-title`);
         this.#description = document.getElementById(`${prefix}-description`);
         this.#descriptionText = document.getElementById(`${prefix}-description-text`);
         this.#originalLineItemId = document.getElementById(`${prefix}-original-line-item-id`);
@@ -1039,7 +1024,7 @@ class LineItemSubForm {
      * @return {JournalEntryAccount|null} the account
      */
     get account() {
-        return this.#accountCode.value === null? null: new JournalEntryAccount(this.#accountCode.value, this.#accountCode.dataset.title, this.#accountCode.dataset.text, this.#accountCode.classList.contains("accounting-account-is-need-offset"));
+        return this.#accountCode.value === null? null: new JournalEntryAccount(this.#accountCode.value, this.#accountCode.dataset.text, this.#accountCode.classList.contains("accounting-account-is-need-offset"));
     }
 
     /**
@@ -1107,15 +1092,13 @@ class LineItemSubForm {
             this.#originalLineItemText.innerText = A_("Offset %(item)s", {item: editor.originalLineItemText});
         }
         this.#accountCode.value = editor.account.code;
-        this.#accountCode.dataset.title = editor.account.title;
         this.#accountCode.dataset.text = editor.account.text;
         if (editor.account.isNeedOffset) {
             this.#accountCode.classList.add("accounting-account-is-need-offset");
         } else {
             this.#accountCode.classList.remove("accounting-account-is-need-offset");
         }
-        this.#accountTextCode.innerText = editor.account.code
+        this.#accountText.innerText = editor.account.text;
-        this.#accountTextTitle.innerText = editor.account.title
         this.#description.value = editor.description === null? "": editor.description;
         this.#descriptionText.innerText = editor.description === null? "": editor.description;
         this.#amount.value = editor.amount;

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

@@ -276,23 +276,19 @@ class JournalEntryLineItemEditor {
         this.originalLineItemDate = originalLineItem.date;
         this.originalLineItemText = originalLineItem.text;
         this.#originalLineItemText.innerText = originalLineItem.text;
-        if (this.description === null) {
+        this.#setEnableDescriptionAccount(false);
-            if (originalLineItem.description === "") {
+        if (originalLineItem.description === "") {
-                this.#descriptionControl.classList.remove("accounting-not-empty");
+            this.#descriptionControl.classList.remove("accounting-not-empty");
-            } else {
+        } else {
-                this.#descriptionControl.classList.add("accounting-not-empty");
+            this.#descriptionControl.classList.add("accounting-not-empty");
-            }
-            this.description = originalLineItem.description === ""? null: originalLineItem.description;
-            this.#descriptionText.innerText = originalLineItem.description;
         }
-        this.#setEnableAccount(false);
+        this.description = originalLineItem.description === ""? null: originalLineItem.description;
+        this.#descriptionText.innerText = originalLineItem.description;
         this.#accountControl.classList.add("accounting-not-empty");
         this.account = originalLineItem.account.copy();
         this.isAccountConfirmed = false;
         this.#accountText.innerText = this.account.text;
-        if (this.#amountInput.value === "" || new Decimal(this.#amountInput.value).greaterThan(originalLineItem.netBalance)) {
+        this.#amountInput.value = String(originalLineItem.netBalance);
-            this.#amountInput.value = String(originalLineItem.netBalance);
-        }
         this.#amountInput.max = String(originalLineItem.netBalance);
         this.#amountInput.min = "0";
         this.#validate();
@@ -309,7 +305,7 @@ class JournalEntryLineItemEditor {
         this.originalLineItemDate = null;
         this.originalLineItemText = null;
         this.#originalLineItemText.innerText = "";
-        this.#setEnableAccount(true);
+        this.#setEnableDescriptionAccount(true);
         this.#accountControl.classList.remove("accounting-not-empty");
         this.account = null;
         this.isAccountConfirmed = false;
@@ -360,7 +356,7 @@ class JournalEntryLineItemEditor {
      */
     saveAccount(account) {
         this.#accountControl.classList.add("accounting-not-empty");
-        this.account = new JournalEntryAccount(account.code, account.title, account.text, account.isNeedOffset);
+        this.account = new JournalEntryAccount(account.code, account.text, account.isNeedOffset);
         this.isAccountConfirmed = true;
         this.#accountText.innerText = account.text;
         this.#validateAccount();
@@ -476,13 +472,12 @@ class JournalEntryLineItemEditor {
         this.originalLineItemDate = null;
         this.originalLineItemText = null;
         this.#originalLineItemText.innerText = "";
-        this.#descriptionControl.dataset.bsTarget = `#accounting-description-editor-${this.#debitCreditSubForm.debitCredit}-modal`;
+        this.#setEnableDescriptionAccount(true);
         this.#descriptionControl.classList.remove("accounting-not-empty");
         this.#descriptionControl.classList.remove("is-invalid");
         this.description = null;
         this.#descriptionText.innerText = ""
         this.#descriptionError.innerText = ""
-        this.#setEnableAccount(true);
         this.#accountControl.classList.remove("accounting-not-empty");
         this.#accountControl.classList.remove("is-invalid");
         this.account = null;
@@ -516,7 +511,7 @@ class JournalEntryLineItemEditor {
             this.#originalLineItemContainer.classList.remove("d-none");
             this.#originalLineItemControl.classList.add("accounting-not-empty");
         }
-        this.#descriptionControl.dataset.bsTarget = `#accounting-description-editor-${this.#debitCreditSubForm.debitCredit}-modal`;
+        this.#setEnableDescriptionAccount(!lineItem.isMatched && this.originalLineItemId === null);
         this.description = lineItem.description;
         if (this.description === null) {
             this.#descriptionControl.classList.remove("accounting-not-empty");
@@ -524,7 +519,6 @@ class JournalEntryLineItemEditor {
             this.#descriptionControl.classList.add("accounting-not-empty");
         }
         this.#descriptionText.innerText = this.description === null? "": this.description;
-        this.#setEnableAccount(!lineItem.isMatched && this.originalLineItemId === null);
         this.account = lineItem.account;
         this.isAccountConfirmed = true;
         if (this.account === null) {
@@ -553,17 +547,25 @@ class JournalEntryLineItemEditor {
     }
 
     /**
-     * Sets the enable status of the account.
+     * Sets the enable status of the description and account.
      *
      * @param isEnabled {boolean} true to enable, or false otherwise
      */
-    #setEnableAccount(isEnabled) {
+    #setEnableDescriptionAccount(isEnabled) {
         if (isEnabled) {
+            this.#descriptionControl.dataset.bsToggle = "modal";
+            this.#descriptionControl.dataset.bsTarget = `#accounting-description-editor-${this.#debitCreditSubForm.debitCredit}-modal`;
+            this.#descriptionControl.classList.remove("accounting-disabled");
+            this.#descriptionControl.classList.add("accounting-clickable");
             this.#accountControl.dataset.bsToggle = "modal";
             this.#accountControl.dataset.bsTarget = `#accounting-account-selector-${this.#debitCreditSubForm.debitCredit}-modal`;
             this.#accountControl.classList.remove("accounting-disabled");
             this.#accountControl.classList.add("accounting-clickable");
         } else {
+            this.#descriptionControl.dataset.bsToggle = "";
+            this.#descriptionControl.dataset.bsTarget = "";
+            this.#descriptionControl.classList.add("accounting-disabled");
+            this.#descriptionControl.classList.remove("accounting-clickable");
             this.#accountControl.dataset.bsToggle = "";
             this.#accountControl.dataset.bsTarget = "";
             this.#accountControl.classList.add("accounting-disabled");

src/accounting/static/js/original-line-item-selector.js

@@ -284,7 +284,7 @@ class OriginalLineItem {
         this.date = element.dataset.date;
         this.#debitCredit = element.dataset.debitCredit;
         this.#currencyCode = element.dataset.currencyCode;
-        this.account = new JournalEntryAccount(element.dataset.accountCode, element.dataset.accountTitle, element.dataset.accountText, false);
+        this.account = new JournalEntryAccount(element.dataset.accountCode, element.dataset.accountText, false);
         this.description = element.dataset.description;
         this.bareNetBalance = new Decimal(element.dataset.netBalance);
         this.netBalance = this.bareNetBalance;

src/accounting/static/js/timezone.js

@@ -1,37 +0,0 @@
-/* The Mia! Accounting Project
- * timezone.js: The JavaScript for the timezone
- */
-
-/*  Copyright (c) 2024 imacat.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  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.
- */
-
-/* Author: imacat@mail.imacat.idv.tw (imacat)
- * First written: 2024/6/4
- */
-"use strict";
-
-// Initializes the page JavaScript.
-document.addEventListener("DOMContentLoaded", () => {
-    setTimeZone();
-});
-
-/**
- * Sets the time zone.
- *
- * @private
- */
-function setTimeZone() {
-    document.cookie = `accounting-tz=${Intl.DateTimeFormat().resolvedOptions().timeZone}; SameSite=Strict`;
-}

src/accounting/template_filters.py

@@ -1,7 +1,7 @@
 # The Mia! Accounting Project.
 # Author: imacat@mail.imacat.idv.tw (imacat), 2023/2/25
 
-#  Copyright (c) 2023-2024 imacat.
+#  Copyright (c) 2023 imacat.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
 """The template filters.
 
 """
-import datetime as dt
+import typing as t
+from datetime import date, timedelta
 from decimal import Decimal
-from typing import Any
 
 from flask_babel import get_locale
 
 from accounting.locale import gettext
-from accounting.utils.timezone import get_tz_today
 
 
 def format_amount(value: Decimal | None) -> str | None:
@@ -42,24 +41,24 @@ def format_amount(value: Decimal | None) -> str | None:
     return "{:,}".format(whole) + str(abs(frac))[1:]
 
 
-def format_date(value: dt.date) -> str:
+def format_date(value: date) -> str:
     """Formats a date to be human-friendly.
 
     :param value: The date.
     :return: The human-friendly date text.
     """
-    today: dt.date = get_tz_today()
+    today: date = date.today()
     if value == today:
         return gettext("Today")
-    if value == today - dt.timedelta(days=1):
+    if value == today - timedelta(days=1):
         return gettext("Yesterday")
-    if value == today + dt.timedelta(days=1):
+    if value == today + timedelta(days=1):
         return gettext("Tomorrow")
     locale = str(get_locale())
     if locale == "zh" or locale.startswith("zh_"):
-        if value == today - dt.timedelta(days=2):
+        if value == today - timedelta(days=2):
             return gettext("The day before yesterday")
-        if value == today + dt.timedelta(days=2):
+        if value == today + timedelta(days=2):
             return gettext("The day after tomorrow")
     if locale == "zh" or locale.startswith("zh_"):
         weekdays = ["一", "二", "三", "四", "五", "六", "日"]
@@ -72,7 +71,7 @@ def format_date(value: dt.date) -> str:
     return "{}/{}({})".format(value.month, value.day, weekday)
 
 
-def default(value: Any, default_value: Any = "") -> Any:
+def default(value: t.Any, default_value: t.Any = "") -> t.Any:
     """Returns the default value if the given value is None.
 
     :param value: The value.

src/accounting/template_globals.py

@@ -21,7 +21,7 @@ from accounting.models import Currency
 from accounting.utils.options import options
 
 
-def currency_options() -> list[Currency]:
+def currency_options() -> str:
     """Returns the currency options.
 
     :return: The currency options.

src/accounting/templates/accounting/account/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/1
 
 {% block header %}{% block title %}{{ A_("Add a New Account") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting.account.list")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.account.list") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.account.store") }}{% endblock %}

src/accounting/templates/accounting/account/detail.html

@@ -90,7 +90,7 @@ First written: 2023/1/31
 {% endif %}
 
 <div class="accounting-card col-sm-6">
-  <div class="accounting-card-title">{{ obj.title }}</div>
+  <div class="accounting-card-title">{{ obj.title|title }}</div>
   <div class="accounting-card-code">{{ obj.code }}</div>
   {% if obj.is_need_offset %}
     <div>

src/accounting/templates/accounting/account/list.html

@@ -32,7 +32,7 @@ First written: 2023/1/30
       {{ A_("New") }}
     </a>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group" name="accounting-search-form" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">

src/accounting/templates/accounting/base-account/detail.html

@@ -33,7 +33,7 @@ First written: 2023/2/1
 </div>
 
 <div class="accounting-card col-sm-6">
-  <div class="accounting-card-title">{{ obj.title }}</div>
+  <div class="accounting-card-title">{{ obj.title|title }}</div>
   <div class="accounting-card-code">{{ obj.code }}</div>
   {% if obj.accounts %}
     <div>

src/accounting/templates/accounting/base-account/list.html

@@ -26,7 +26,7 @@ First written: 2023/1/26
 {% block content %}
 
 <div class="mb-2 accounting-toolbar">
-  <form class="btn btn-primary d-flex input-group" name="accounting-search-form" action="{{ url_for("accounting.base-account.list") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.base-account.list") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">

src/accounting/templates/accounting/base.html

@@ -2,7 +2,7 @@
 The Mia! Accounting Project
 base.html: The application-wide base template.
 
- Copyright (c) 2023-2024 imacat.
+ Copyright (c) 2023 imacat.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -27,6 +27,5 @@ First written: 2023/1/27
 
 {% block scripts %}
   <script src="{{ url_for("accounting.babel_catalog") }}"></script>
-  <script src="{{ url_for("accounting.static", filename="js/timezone.js") }}"></script>
   {% block accounting_scripts %}{% endblock %}
 {% endblock %}

src/accounting/templates/accounting/currency/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/6
 
 {% block header %}{% block title %}{{ A_("Add a New Currency") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting.currency.list")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.currency.list") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.currency.store") }}{% endblock %}

src/accounting/templates/accounting/currency/list.html

@@ -32,7 +32,7 @@ First written: 2023/2/6
       {{ A_("New") }}
     </a>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group" name="accounting-search-form" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">

src/accounting/templates/accounting/include/nav.html

@@ -51,6 +51,14 @@ First written: 2023/1/26
           {{ A_("Currencies") }}
         </a>
       </li>
+      {% if accounting_can_edit() %}
+        <li>
+          <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.unmatched-offset.") %} active {% endif %}" href="{{ url_for("accounting.unmatched-offset.dashboard") }}">
+            <i class="fa-solid fa-link-slash"></i>
+            {{ A_("Unmatched Offsets") }}
+          </a>
+        </li>
+      {% endif %}
       {% if accounting_can_admin() %}
         <li>
           <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.option.") %} active {% endif %}" href="{{ url_for("accounting.option.detail") }}">

src/accounting/templates/accounting/journal-entry/disbursement/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Cash Disbursement Journal Entry") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}

src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html

@@ -37,7 +37,7 @@ First written: 2023/2/25
 
         <ul id="accounting-account-selector-{{ debit_credit }}-option-list" class="list-group accounting-selector-list">
           {% for account in account_options %}
-            <li id="accounting-account-selector-{{ debit_credit }}-option-{{ account.code }}" class="list-group-item accounting-clickable accounting-account-selector-{{ debit_credit }}-option {% if account.is_in_use %} accounting-account-is-in-use {% endif %} {% if account.is_need_offset %} accounting-account-is-need-offset {% endif %}" data-code="{{ account.code }}" data-title="{{ account.title }}" data-text="{{ account }}" data-query-values="{{ account.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-line-item-editor-modal">
+            <li id="accounting-account-selector-{{ debit_credit }}-option-{{ account.code }}" class="list-group-item accounting-clickable accounting-account-selector-{{ debit_credit }}-option {% if account.is_in_use %} accounting-account-is-in-use {% endif %} {% if account.is_need_offset %} accounting-account-is-need-offset {% endif %}" data-code="{{ account.code }}" data-text="{{ account }}" data-query-values="{{ account.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-line-item-editor-modal">
               {{ account }}
             </li>
           {% endfor %}

src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html

@@ -20,7 +20,6 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/2/28
 #}
 <form id="accounting-description-editor-{{ description_editor.debit_credit }}" class="accounting-description-editor" data-debit-credit="{{ description_editor.debit_credit }}">
-  <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
   <div id="accounting-description-editor-{{ description_editor.debit_credit }}-modal" class="modal fade" tabindex="-1" aria-labelledby="accounting-description-editor-{{ description_editor.debit_credit }}-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
@@ -185,7 +184,7 @@ First written: 2023/2/28
           <div class="mt-3 accounting-description-editor-buttons">
             <button id="accounting-description-editor-{{ description_editor.debit_credit }}-account-confirmed" class="btn btn-primary mb-1 d-none" type="button"></button>
             {% for account in description_editor.accounts %}
-              <button class="btn btn-outline-primary d-none accounting-description-editor-{{ description_editor.debit_credit }}-account {% if account.is_need_offset %} accounting-account-is-need-offset {% endif %}" type="button" data-code="{{ account.code }}" data-title="{{ account.title }}" data-text="{{ account }}">
+              <button class="btn btn-outline-primary d-none accounting-description-editor-{{ description_editor.debit_credit }}-account {% if account.is_need_offset %} accounting-account-is-need-offset {% endif %}" type="button" data-code="{{ account.code }}" data-text="{{ account }}">
                 {{ account }}
               </button>
             {% endfor %}

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

@@ -24,10 +24,7 @@ First written: 2023/3/14
   <li class="list-group-item accounting-journal-entry-line-item">
     <div class="d-flex justify-content-between">
       <div>
-        <div class="small">
+        <div class="small">{{ line_item.account }}</div>
-          <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-          {{ line_item.account.title }}
-        </div>
         {% if line_item.description is not none %}
           <div>{{ line_item.description }}</div>
         {% endif %}

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", date=obj.date)|accounting_append_next }}">
+  <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.order", journal_entry_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/include/form-line-item.html

@@ -26,16 +26,13 @@ First written: 2023/2/25
   {% endif %}
   <input id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-no" type="hidden" name="currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-no" value="{{ line_item_index }}">
   <input id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-original-line-item-id" class="accounting-original-line-item-id" type="hidden" name="currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-original_line_item_id" value="{{ form.original_line_item_id.data|accounting_default }}" data-date="{{ form.original_line_item_date|accounting_default }}" data-text="{{ form.original_line_item_text|accounting_default }}">
-  <input id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account-code" class="{% if form.is_need_offset %} accounting-account-is-need-offset {% endif %}" type="hidden" name="currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account_code" value="{{ form.account_code.data|accounting_default }}" data-title="{{ form.account_title }}" data-text="{{ form.account_text }}">
+  <input id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account-code" class="{% if form.is_need_offset %} accounting-account-is-need-offset {% endif %}" type="hidden" name="currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account_code" value="{{ form.account_code.data|accounting_default }}" data-text="{{ form.account_text }}">
   <input id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-description" type="hidden" name="currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-description" value="{{ form.description.data|accounting_default }}">
   <input id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-amount" type="hidden" name="currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-amount" value="{{ form.amount.data|accounting_journal_entry_format_amount_input }}" data-min="{{ form.offset_total|accounting_default("0") }}">
   <div class="accounting-line-item-content">
     <div id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-control" class="form-control clickable d-flex justify-content-between {% if form.all_errors %} is-invalid {% endif %}" data-bs-toggle="modal" data-bs-target="#accounting-line-item-editor-modal">
       <div>
-        <div class="small">
+        <div id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account-text" class="small">{{ form.account_text }}</div>
-          <span id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account-text-code" class="d-none d-md-inline">{{ form.account_code.data|accounting_default }}</span>
-          <span id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-account-text-title">{{ form.account_title }}</span>
-        </div>
         <div id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-description-text">{{ form.description.data|accounting_default }}</div>
         <div id="accounting-currency-{{ currency_index }}-{{ debit_credit }}-{{ line_item_index }}-original-line-item-text" class="fst-italic small accounting-original-line-item {% if not form.original_line_item_id.data %} d-none {% endif %}">
           {% if form.original_line_item_id.data %}{{ A_("Offset %(item)s", item=form.original_line_item_text|accounting_default) }}{% endif %}

src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html

@@ -20,7 +20,6 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/2/25
 #}
 <form id="accounting-line-item-editor">
-  <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
   <div id="accounting-line-item-editor-modal" class="modal fade" tabindex="-1" aria-labelledby="accounting-line-item-editor-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">

src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html

@@ -37,15 +37,8 @@ First written: 2023/2/25
 
         <ul id="accounting-original-line-item-selector-option-list" class="list-group accounting-selector-list">
           {% for line_item in form.original_line_item_options %}
-            <li id="accounting-original-line-item-selector-option-{{ line_item.id }}" class="list-group-item d-flex justify-content-between accounting-clickable accounting-original-line-item-selector-option" data-id="{{ line_item.id }}" data-date="{{ line_item.journal_entry.date }}" data-debit-credit="{{ "debit" if line_item.is_debit else "credit" }}" data-currency-code="{{ line_item.currency.code }}" data-account-code="{{ line_item.account_code }}" data-account-title="{{ line_item.account.title }}" data-account-text="{{ line_item.account }}" data-description="{{ line_item.description|accounting_default }}" data-net-balance="{{ line_item.net_balance|accounting_journal_entry_format_amount_input }}" data-text="{{ line_item }}" data-query-values="{{ line_item.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-line-item-editor-modal">
+            <li id="accounting-original-line-item-selector-option-{{ line_item.id }}" class="list-group-item d-flex justify-content-between accounting-clickable accounting-original-line-item-selector-option" data-id="{{ line_item.id }}" data-date="{{ line_item.journal_entry.date }}" data-debit-credit="{{ "debit" if line_item.is_debit else "credit" }}" data-currency-code="{{ line_item.currency.code }}" data-account-code="{{ line_item.account_code }}" data-account-text="{{ line_item.account }}" data-description="{{ line_item.description|accounting_default }}" data-net-balance="{{ line_item.net_balance|accounting_journal_entry_format_amount_input }}" data-text="{{ line_item }}" data-query-values="{{ line_item.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-line-item-editor-modal">
-              <div>
+              <div>{{ line_item.journal_entry.date|accounting_format_date }} {{ line_item.description|accounting_default }}</div>
-                <div class="small">
-                  {{ line_item.journal_entry.date|accounting_format_date }}
-                  <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-                  {{ line_item.account.title }}
-                </div>
-                {{ line_item.description|accounting_default }}
-              </div>
               <div>
                 <span class="badge bg-primary rounded-pill">
                   <span id="accounting-original-line-item-selector-option-{{ line_item.id }}-net-balance">{{ line_item.net_balance|accounting_format_amount }}</span>

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", date=date) }}" method="post">
+  <form action="{{ url_for("accounting.journal-entry.sort", journal_entry_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/templates/accounting/journal-entry/receipt/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Cash Receipt Journal Entry") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}

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

@@ -23,7 +23,7 @@ First written: 2023/2/26
 
 {% block as_trasfer %}
   <a class="btn btn-primary" role="button" href="{{ url_for("accounting.journal-entry.edit", journal_entry=obj)|accounting_journal_entry_to_transfer|accounting_inherit_next }}">
-    <i class="fa-solid fa-table-columns"></i>
+    <i class="fa-solid fa-bars-staggered"></i>
     <span class="d-none d-md-inline">{{ A_("As Transfer") }}</span>
   </a>
 {% endblock %}

src/accounting/templates/accounting/journal-entry/transfer/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Transfer Journal Entry") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}

src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html

@@ -20,7 +20,6 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/3/22
 #}
 <form id="accounting-recurring-item-editor-{{ expense_income }}">
-  <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
   <div id="accounting-recurring-item-editor-{{ expense_income }}-modal" class="modal fade" tabindex="-1" aria-labelledby="accounting-recurring-item-editor-{{ expense_income }}-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">

src/accounting/templates/accounting/report/balance-sheet.html

@@ -26,7 +26,7 @@ First written: 2023/3/7
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Balance Sheet %(period)s", period=report.period.desc|title) }}{% else %}{{ A_("Balance Sheet of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ A_("Balance Sheet of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -46,13 +46,7 @@ First written: 2023/3/7
 {% if report.has_data %}
   <div class="accounting-sheet">
     <div class="d-none d-sm-flex justify-content-center mb-3">
-      <h2 class="text-center">
+      <h2 class="text-center">{{ A_("Balance Sheet of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}</h2>
-        {% if report.currency.code == accounting_default_currency_code() %}
-          {{ A_("Balance Sheet %(period)s", period=report.period.desc|title) }}
-        {% else %}
-          {{ A_("Balance Sheet of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}
-        {% endif %}
-      </h2>
     </div>
 
     <div class="row accounting-report-table accounting-balance-sheet-table">

src/accounting/templates/accounting/report/include/balance-sheet-section.html

@@ -20,21 +20,21 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/3/8
 #}
 <div class="accounting-report-table-row accounting-balance-sheet-section">
-  <div>{{ section.title.title }}</div>
+  <div>{{ section.title.title|title }}</div>
 </div>
 <div class="accounting-report-table-body">
   {% for subsection in section.subsections %}
     <div class="accounting-report-table-row accounting-balance-sheet-subsection">
       <div>
         <span class="d-none d-md-inline">{{ subsection.title.code }}</span>
-        {{ subsection.title.title }}
+        {{ subsection.title.title|title }}
       </div>
     </div>
     {% for account in subsection.accounts %}
       <a class="d-flex justify-content-between accounting-report-table-row accounting-balance-sheet-account" href="{{ account.url }}">
         <div>
           <span class="d-none d-md-inline">{{ account.account.code }}</span>
-          {{ account.account.title }}
+          {{ account.account.title|title }}
         </div>
         <div class="accounting-amount {% if account.amount < 0 %} text-danger {% endif %}">{{ account.amount|accounting_report_format_amount }}</div>
       </a>

src/accounting/templates/accounting/report/include/income-expenses-row-desktop.html

@@ -20,7 +20,7 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/3/8
 #}
 <div>{{ line_item.date|accounting_format_date }}</div>
-<div>{{ line_item.account.title }}</div>
+<div>{{ line_item.account.title|title }}</div>
 <div>{{ line_item.description|accounting_default }}</div>
 <div class="accounting-amount">{{ line_item.income|accounting_format_amount|accounting_default }}</div>
 <div class="accounting-amount">{{ line_item.expense|accounting_format_amount|accounting_default }}</div>

src/accounting/templates/accounting/report/include/income-expenses-row-mobile.html

@@ -26,7 +26,7 @@ First written: 2023/3/5
         {{ line_item.date|accounting_format_date }}
       {% endif %}
       {% if line_item.account %}
-        {{ line_item.account.title }}
+        {{ line_item.account.title|title }}
       {% endif %}
     </div>
   {% endif %}

src/accounting/templates/accounting/report/include/search-modal.html

@@ -19,7 +19,7 @@ search-modal.html: The search modal
 Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/3/8
 #}
-<form action="{{ url_for("accounting-report.search") }}" name="accounting-search-form" method="get" role="search" aria-labelledby="accounting-search-modal-label">
+<form action="{{ url_for("accounting-report.search") }}" method="get" role="search" aria-labelledby="accounting-search-modal-label">
   <div class="modal fade" id="accounting-search-modal" tabindex="-1" aria-labelledby="accounting-search-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">

src/accounting/templates/accounting/report/include/toolbar-buttons.html

@@ -89,11 +89,11 @@ First written: 2023/3/8
       <i class="fa-solid fa-clipboard"></i>
       <span class="d-none d-md-inline">{{ A_("Account") }}</span>
     </button>
-    <ul class="dropdown-menu accounting-toolbar-accounts" aria-labelledby="accounting-choose-account">
+    <ul class="dropdown-menu" aria-labelledby="accounting-choose-account">
       {% for account in report.account_options %}
         <li>
           <a class="dropdown-item {% if account.is_active %} active {% endif %}" href="{{ account.url }}">
-            {{ account.title }}
+            {{ account.title|title }}
           </a>
         </li>
       {% endfor %}
@@ -118,7 +118,7 @@ First written: 2023/3/8
   </button>
 {% endif %}
 {% if use_search %}
-  <form class="btn btn-primary d-flex input-group" name="accounting-search-form" action="{{ url_for("accounting-report.search") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting-report.search") }}" method="get" role="search" aria-labelledby="accounting-toolbar-search-label">
     <input id="accounting-toolbar-search" class="form-control form-control-sm" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label id="accounting-toolbar-search-label" for="accounting-toolbar-search" class="input-group-text">
       <button type="submit">

src/accounting/templates/accounting/report/income-expenses.html

@@ -26,7 +26,7 @@ First written: 2023/3/5
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Income and Expenses Log of %(account)s %(period)s", account=report.account.title, period=report.period.desc|title) }}{% else %}{{ A_("Income and Expenses Log of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ A_("Income and Expenses Log of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 

src/accounting/templates/accounting/report/income-statement.html

@@ -26,7 +26,7 @@ First written: 2023/3/7
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Income Statement %(period)s", period=report.period.desc|title) }}{% else %}{{ A_("Income Statement of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ A_("Income Statement of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -46,13 +46,7 @@ First written: 2023/3/7
 {% if report.has_data %}
   <div class="accounting-sheet">
     <div class="d-none d-sm-flex justify-content-center mb-3">
-      <h2 class="text-center">
+      <h2 class="text-center">{{ A_("Income Statement of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}</h2>
-        {% if report.currency.code == accounting_default_currency_code() %}
-          {{ A_("Income Statement %(period)s", period=report.period.desc|title) }}
-        {% else %}
-          {{ A_("Income Statement of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}
-        {% endif %}
-      </h2>
     </div>
 
     <div class="accounting-report-table accounting-income-statement-table">
@@ -66,21 +60,21 @@ First written: 2023/3/7
           <div class="accounting-report-table-row accounting-income-statement-section">
             <div>
               <span class="d-none d-md-inline">{{ section.title.code }}</span>
-              {{ section.title.title }}
+              {{ section.title.title|title }}
             </div>
           </div>
           {% for subsection in section.subsections %}
             <div class="accounting-report-table-row accounting-income-statement-subsection">
               <div>
                 <span class="d-none d-md-inline">{{ subsection.title.code }}</span>
-                {{ subsection.title.title }}
+                {{ subsection.title.title|title }}
               </div>
             </div>
             {% for account in subsection.accounts %}
               <a class="accounting-report-table-row accounting-income-statement-account" href="{{ account.url }}">
                 <div>
                   <span class="d-none d-md-inline">{{ account.account.code }}</span>
-                  {{ account.account.title }}
+                  {{ account.account.title|title }}
                 </div>
                 <div class="accounting-amount {% if account.amount < 0 %} text-danger {% endif %}">{{ account.amount|accounting_report_format_amount }}</div>
               </a>
@@ -91,7 +85,7 @@ First written: 2023/3/7
             </div>
           {% endfor %}
           <div class="accounting-report-table-row accounting-income-statement-total">
-            <div>{{ section.accumulated.title }}</div>
+            <div>{{ section.accumulated.title|title }}</div>
             <div class="accounting-amount {% if section.accumulated.amount < 0 %} text-danger {% endif %}">{{ section.accumulated.amount|accounting_report_format_amount }}</div>
           </div>
         {% endfor %}

src/accounting/templates/accounting/report/journal.html

@@ -65,7 +65,7 @@ First written: 2023/3/4
           <div>{{ line_item.currency.name }}</div>
           <div>
             <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-            {{ line_item.account.title }}
+            {{ line_item.account.title|title }}
           </div>
           <div>{{ line_item.description|accounting_default }}</div>
           <div class="accounting-amount">{{ line_item.debit|accounting_format_amount|accounting_default }}</div>
@@ -82,7 +82,7 @@ First written: 2023/3/4
         <div {% if not line_item.is_debit %} class="accounting-mobile-journal-credit" {% endif %}>
           <div class="text-muted small">
             {{ line_item.journal_entry.date|accounting_format_date }}
-            {{ line_item.account.title }}
+            {{ line_item.account.title|title }}
             {% if line_item.currency.code != accounting_default_currency_code() %}
               <span class="badge rounded-pill bg-info">{{ line_item.currency.code }}</span>
             {% endif %}

src/accounting/templates/accounting/report/ledger.html

@@ -26,7 +26,7 @@ First written: 2023/3/5
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Ledger of %(account)s %(period)s", account=report.account.title, period=report.period.desc|title) }}{% else %}{{ A_("Ledger of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ A_("Ledger of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 

src/accounting/templates/accounting/report/search.html

@@ -62,7 +62,7 @@ First written: 2023/3/8
           <div>{{ line_item.currency.name }}</div>
           <div>
             <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-            {{ line_item.account.title }}
+            {{ line_item.account.title|title }}
           </div>
           <div>{{ line_item.description|accounting_default }}</div>
           <div class="accounting-amount">{{ line_item.debit|accounting_format_amount|accounting_default }}</div>
@@ -79,7 +79,7 @@ First written: 2023/3/8
         <div {% if not line_item.is_debit %} class="accounting-mobile-journal-credit" {% endif %}>
           <div class="text-muted small">
             {{ line_item.journal_entry.date|accounting_format_date }}
-            {{ line_item.account.title }}
+            {{ line_item.account.title|title }}
             {% if line_item.currency.code != accounting_default_currency_code() %}
               <span class="badge rounded-pill bg-info">{{ line_item.currency.code }}</span>
             {% endif %}