docs/source/changelog.rst

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

src/accounting/__init__.py

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

src/accounting/models.py

@@ -22,7 +22,7 @@ from __future__ import annotations
 import datetime as dt
 import re
 from decimal import Decimal
-from typing import Type, Self
+from typing import Type, Annotated, Self
 
 import sqlalchemy as sa
 from babel import Locale
@@ -34,6 +34,18 @@ from accounting import db
 from accounting.locale import gettext
 from accounting.utils.user import user_cls, user_pk_column
 
+timestamp: Type[dt.datetime] \
+    = Annotated[dt.datetime, mapped_column(db.DateTime(timezone=True),
+                                           server_default=db.func.now())]
+"""The timestamp."""
+user_pk: Type[int] \
+    = Annotated[int, mapped_column(db.ForeignKey(user_pk_column,
+                                                 onupdate="CASCADE"))]
+"""The user primary key."""
+random_pk: Type[int] \
+    = Annotated[int, mapped_column(primary_key=True, autoincrement=False)]
+"""The random primary key."""
+
 
 class BaseAccount(db.Model):
     """A base account."""
@@ -114,21 +126,15 @@ class Account(db.Model):
     """The title."""
     is_need_offset: Mapped[bool] = mapped_column(default=False)
     """Whether the journal entry line items of this account need offset."""
-    created_at: Mapped[dt.datetime] \
+    created_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was created."""
-    created_by_id: Mapped[int] \
+    created_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
     """The user who created the record."""
-    updated_at: Mapped[dt.datetime] \
+    updated_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was last updated."""
-    updated_by_id: Mapped[int] \
+    updated_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
     """The last user who updated the record."""
@@ -370,21 +376,15 @@ class Currency(db.Model):
     """The code."""
     name_l10n: Mapped[str] = mapped_column("name")
     """The name."""
-    created_at: Mapped[dt.datetime] \
+    created_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was created."""
-    created_by_id: Mapped[int] \
+    created_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
     """The user who created the record."""
-    updated_at: Mapped[dt.datetime] \
+    updated_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was last updated."""
-    updated_by_id: Mapped[int] \
+    updated_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] \
         = db.relationship(foreign_keys=updated_by_id)
@@ -543,21 +543,15 @@ class JournalEntry(db.Model):
     """The account number under the date."""
     note: Mapped[str | None]
     """The note."""
-    created_at: Mapped[dt.datetime] \
+    created_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was created."""
-    created_by_id: Mapped[int] \
+    created_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
     """The user who created the record."""
-    updated_at: Mapped[dt.datetime] \
+    updated_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was last updated."""
-    updated_by_id: Mapped[int] \
+    updated_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
     """The last user who updated the record."""
@@ -882,21 +876,15 @@ class Option(db.Model):
     """The name."""
     value: Mapped[str] = mapped_column(db.Text)
     """The option value."""
-    created_at: Mapped[dt.datetime] \
+    created_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was created."""
-    created_by_id: Mapped[int] \
+    created_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the user who created the record."""
     created_by: Mapped[user_cls] = db.relationship(foreign_keys=created_by_id)
     """The user who created the record."""
-    updated_at: Mapped[dt.datetime] \
+    updated_at: Mapped[timestamp]
-        = mapped_column(db.DateTime(timezone=True),
-                        server_default=db.func.now())
     """The date and time when this record was last updated."""
-    updated_by_id: Mapped[int] \
+    updated_by_id: Mapped[user_pk] = mapped_column()
-        = mapped_column(db.ForeignKey(user_pk_column, onupdate="CASCADE"))
     """The ID of the last user who updated the record."""
     updated_by: Mapped[user_cls] = db.relationship(foreign_keys=updated_by_id)
     """The last user who updated the record."""

src/accounting/report/reports/unapplied_accounts.py

@@ -143,7 +143,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:

src/accounting/report/reports/unmatched_accounts.py

@@ -144,7 +144,7 @@ class AccountsWithUnmatchedOffsets(BaseReport):
 
         :return: The response of the report for download.
         """
-        filename: str = "unmatched-accounts.csv"
+        filename: str = f"unapplied-accounts.csv"
         return csv_download(filename, get_csv_rows(self.__accounts))
 
     def html(self) -> str:

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

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