src/accounting/base_account/views.py

@@ -22,7 +22,6 @@ from flask import Blueprint, render_template
 from accounting.models import BaseAccount
 from accounting.utils.pagination import Pagination
 from accounting.utils.permission import has_permission, can_view
-from .queries import get_base_account_query
 
 bp: Blueprint = Blueprint("base-account", __name__)
 """The view blueprint for the base account management."""
@@ -35,6 +34,7 @@ def list_accounts() -> str:
 
     :return: The account list.
     """
+    from .queries import get_base_account_query
     accounts: list[BaseAccount] = get_base_account_query()
     pagination: Pagination = Pagination[BaseAccount](accounts)
     return render_template("accounting/base-account/list.html",

src/accounting/currency/views.py

@@ -34,7 +34,6 @@ from accounting.utils.pagination import Pagination
 from accounting.utils.permission import has_permission, can_view, can_edit
 from accounting.utils.user import get_current_user_pk
 from .forms import CurrencyForm
-from .queries import get_currency_query
 
 bp: Blueprint = Blueprint("currency", __name__)
 """The view blueprint for the currency management."""
@@ -49,6 +48,7 @@ def list_currencies() -> str:
 
     :return: The currency list.
     """
+    from .queries import get_currency_query
     currencies: list[Currency] = get_currency_query()
     pagination: Pagination = Pagination[Currency](currencies)
     return render_template("accounting/currency/list.html",

src/accounting/journal_entry/converters.py

@@ -23,7 +23,6 @@ from flask import abort
 from sqlalchemy.orm import selectinload
 from werkzeug.routing import BaseConverter
 
-from accounting import db
 from accounting.models import JournalEntry, JournalEntryLineItem
 from accounting.utils.journal_entry_types import JournalEntryType
 
@@ -38,7 +37,13 @@ class JournalEntryConverter(BaseConverter):
         :param value: The journal entry ID.
         :return: The corresponding journal entry.
         """
-        journal_entry: JournalEntry | None = db.session.get(JournalEntry, value)
+        journal_entry: JournalEntry | None = JournalEntry.query\
+            .join(JournalEntryLineItem)\
+            .filter(JournalEntry.id == value)\
+            .options(selectinload(JournalEntry.line_items)
+                     .selectinload(JournalEntryLineItem.offsets)
+                     .selectinload(JournalEntryLineItem.journal_entry))\
+            .first()
         if journal_entry is None:
             abort(404)
         return journal_entry

src/accounting/journal_entry/forms/line_item.py

@@ -31,7 +31,7 @@ from accounting import db
 from accounting.forms import ACCOUNT_REQUIRED, AccountExists, IsDebitAccount, \
     IsCreditAccount
 from accounting.locale import lazy_gettext
-from accounting.models import Account, JournalEntry, JournalEntryLineItem
+from accounting.models import Account, JournalEntryLineItem
 from accounting.template_filters import format_amount
 from accounting.utils.cast import be
 from accounting.utils.random_id import new_id
@@ -127,8 +127,10 @@ class KeepAccountWhenHavingOffset:
         assert isinstance(form, LineItemForm)
         if field.data is None or form.id.data is None:
             return
-        line_item: JournalEntryLineItem | None \
-            = db.session.get(JournalEntryLineItem, form.id.data)
+        line_item: JournalEntryLineItem | None = db.session\
+            .query(JournalEntryLineItem)\
+            .filter(JournalEntryLineItem.id == form.id.data)\
+            .options(selectinload(JournalEntryLineItem.offsets)).first()
         if line_item is None or len(line_item.offsets) == 0:
             return
         if field.data != line_item.account_code:
@@ -342,13 +344,14 @@ class LineItemForm(FlaskForm):
             def get_offsets() -> list[JournalEntryLineItem]:
                 if not self.is_need_offset or self.id.data is None:
                     return []
-                return JournalEntryLineItem.query.join(JournalEntry)\
+                return JournalEntryLineItem.query\
                     .filter(JournalEntryLineItem.original_line_item_id
                             == self.id.data)\
-                    .order_by(JournalEntry.date, JournalEntry.no,
-                              JournalEntryLineItem.no)\
                     .options(selectinload(JournalEntryLineItem.journal_entry),
-                             selectinload(JournalEntryLineItem.account)).all()
+                             selectinload(JournalEntryLineItem.account),
+                             selectinload(JournalEntryLineItem.offsets)
+                             .selectinload(
+                                 JournalEntryLineItem.journal_entry)).all()
             setattr(self, "__offsets", get_offsets())
         return getattr(self, "__offsets")
 

src/accounting/models.py

@@ -660,8 +660,12 @@ class JournalEntryLineItem(db.Model):
                                       nullable=True)
     """The ID of the original line item."""
     original_line_item = db.relationship("JournalEntryLineItem",
+                                         back_populates="offsets",
                                          remote_side=id, passive_deletes=True)
     """The original line item."""
+    offsets = db.relationship("JournalEntryLineItem",
+                              back_populates="original_line_item")
+    """The offset items."""
     currency_code = db.Column(db.String,
                               db.ForeignKey(Currency.code, onupdate="CASCADE"),
                               nullable=False)
@@ -754,21 +758,6 @@ class JournalEntryLineItem(db.Model):
         """
         setattr(self, "__net_balance", net_balance)
 
-    @property
-    def offsets(self) -> list[t.Self]:
-        """Returns the offset items.
-
-        :return: The offset items.
-        """
-        if not hasattr(self, "__offsets"):
-            cls: t.Type[t.Self] = self.__class__
-            offsets: list[t.Self] = cls.query.join(JournalEntry)\
-                .filter(JournalEntryLineItem.original_line_item_id == self.id)\
-                .order_by(JournalEntry.date, JournalEntry.no,
-                          cls.is_debit, cls.no).all()
-            setattr(self, "__offsets", offsets)
-        return getattr(self, "__offsets")
-
     @property
     def query_values(self) -> list[str]:
         """Returns the values to be queried.

src/accounting/report/reports/journal.py

@@ -77,8 +77,6 @@ class CSVRow(BaseCSVRow):
         """Constructs a row in the CSV.
 
         :param journal_entry_date: The journal entry date.
-        :param currency: The currency.
-        :param account: The account.
         :param description: The description.
         :param debit: The debit amount.
         :param credit: The credit amount.
@@ -118,7 +116,6 @@ class PageParams(BasePageParams):
         """Constructs the HTML page parameters.
 
         :param period: The period.
-        :param pagination: The pagination.
         :param line_items: The line items.
         """
         self.period: Period = period

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

@@ -123,7 +123,7 @@ class JournalEntryAccountSelector {
                 option.setShown(false);
             }
         }
-        if (!isAnyMatched && this.#isShowMore) {
+        if (!isAnyMatched) {
             this.#optionList.classList.add("d-none");
             this.#queryNoResult.classList.remove("d-none");
         } else {

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

@@ -50,10 +50,10 @@ First written: 2023/3/14
                   {% endfor %}
                 </ul>
               </div>
-              {% if line_item.net_balance %}
+              {% if line_item.balance %}
                 <div class="d-flex justify-content-between">
                   <div>{{ A_("Net balance") }}</div>
-                  <div>{{ line_item.net_balance|accounting_format_amount }}</div>
+                  <div>{{ line_item.balance|accounting_format_amount }}</div>
                 </div>
               {% else %}
                 <div class="d-flex justify-content-between">