imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 41 Wiki Activity

Removed the lazy setting from the account relationship of the JournalEntry data model. It results in problems in the income and expense report.

Browse Source
This commit is contained in:
依瑪貓 2023-03-05 19:14:07 +08:00
parent 8cd004bede
commit 39723b1299
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/accounting/models.py
View File

@ -655,7 +655,7 @@ class JournalEntry(db.Model):
onupdate="CASCADE"), onupdate="CASCADE"),
nullable=False) nullable=False)
"""The account ID.""" """The account ID."""
account = db.relationship(Account, back_populates="entries", lazy=False) account = db.relationship(Account, back_populates="entries")
"""The account.""" """The account."""
summary = db.Column(db.String, nullable=True) summary = db.Column(db.String, nullable=True)
"""The summary.""" """The summary."""

80
tests/testlib_txn.py
View File

@ -137,48 +137,48 @@ def get_unchanged_update_form(txn_id: int, app: Flask, csrf_token: str) \
assert txn is not None assert txn is not None
currencies: list[TransactionCurrency] = txn.currencies currencies: list[TransactionCurrency] = txn.currencies
form: dict[str, str] = {"csrf_token": csrf_token, form: dict[str, str] = {"csrf_token": csrf_token,
"next": NEXT_URI, "next": NEXT_URI,
"date": txn.date, "date": txn.date,
"note": " \n \n\n " if txn.note is None "note": " \n \n\n " if txn.note is None
else f"\n \n\n \n \n{txn.note} \n\n "} else f"\n \n\n \n \n{txn.note} \n\n "}
currency_indices_used: set[int] = set() currency_indices_used: set[int] = set()
currency_no: int = 0 currency_no: int = 0
for currency in currencies: for currency in currencies:
currency_index: int = __get_new_index(currency_indices_used) currency_index: int = __get_new_index(currency_indices_used)
currency_no = currency_no + 3 + randbelow(3) currency_no = currency_no + 3 + randbelow(3)
currency_prefix: str = f"currency-{currency_index}" currency_prefix: str = f"currency-{currency_index}"
form[f"{currency_prefix}-no"] = str(currency_no) form[f"{currency_prefix}-no"] = str(currency_no)
form[f"{currency_prefix}-code"] = currency.code form[f"{currency_prefix}-code"] = currency.code
entry_indices_used: set[int] entry_indices_used: set[int]
entry_no: int entry_no: int
prefix: str prefix: str
entry_indices_used = set() entry_indices_used = set()
entry_no = 0 entry_no = 0
for entry in currency.debit: for entry in currency.debit:
entry_index: int = __get_new_index(entry_indices_used) entry_index: int = __get_new_index(entry_indices_used)
entry_no = entry_no + 3 + randbelow(3) entry_no = entry_no + 3 + randbelow(3)
prefix = f"{currency_prefix}-debit-{entry_index}" prefix = f"{currency_prefix}-debit-{entry_index}"
form[f"{prefix}-eid"] = str(entry.id) form[f"{prefix}-eid"] = str(entry.id)
form[f"{prefix}-no"] = str(entry_no) form[f"{prefix}-no"] = str(entry_no)
form[f"{prefix}-account_code"] = entry.account.code form[f"{prefix}-account_code"] = entry.account.code
form[f"{prefix}-summary"] \ form[f"{prefix}-summary"] \
= " " if entry.summary is None else f" {entry.summary} " = " " if entry.summary is None else f" {entry.summary} "
form[f"{prefix}-amount"] = str(entry.amount) form[f"{prefix}-amount"] = str(entry.amount)
entry_indices_used = set() entry_indices_used = set()
entry_no = 0 entry_no = 0
for entry in currency.credit: for entry in currency.credit:
entry_index: int = __get_new_index(entry_indices_used) entry_index: int = __get_new_index(entry_indices_used)
entry_no = entry_no + 3 + randbelow(3) entry_no = entry_no + 3 + randbelow(3)
prefix = f"{currency_prefix}-credit-{entry_index}" prefix = f"{currency_prefix}-credit-{entry_index}"
form[f"{prefix}-eid"] = str(entry.id) form[f"{prefix}-eid"] = str(entry.id)
form[f"{prefix}-no"] = str(entry_no) form[f"{prefix}-no"] = str(entry_no)
form[f"{prefix}-account_code"] = entry.account.code form[f"{prefix}-account_code"] = entry.account.code
form[f"{prefix}-summary"] \ form[f"{prefix}-summary"] \
= " " if entry.summary is None else f" {entry.summary} " = " " if entry.summary is None else f" {entry.summary} "
form[f"{prefix}-amount"] = str(entry.amount) form[f"{prefix}-amount"] = str(entry.amount)
return form return form