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

Fixed the account options to list only the current assets and liabilities for the income and expenses.

Browse Source
This commit is contained in:
依瑪貓 2023-03-05 22:28:28 +08:00
parent 7e7e1a2844
commit 90289a0db2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/accounting/report/reports.py
View File

@ -623,7 +623,12 @@ class IncomeExpenses(JournalEntryReport[IncomeExpensesRow]):
in_use: set[int] = set(db.session.scalars(
sa.select(JournalEntry.account_id)
.filter(JournalEntry.currency_code == self.currency.code)
.join(Account)
.filter(JournalEntry.currency_code == self.currency.code,
sa.or_(Account.base_code.startswith("11"),
Account.base_code.startswith("12"),
Account.base_code.startswith("21"),
Account.base_code.startswith("22")))
.group_by(JournalEntry.account_id)).all())
return [OptionLink(str(x), get_url(x), x.id == self.account.id)
for x in Account.query.filter(Account.id.in_(in_use))