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

Simplified the SQL query in the currency_options and account_options pseudo properties in the Ledger report and the account_options pseudo property in the IncomeExpenses report.

Browse Source
This commit is contained in:
依瑪貓 2023-03-05 22:34:52 +08:00
parent ace782a26b
commit e244ff70e6
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,9 +389,8 @@ class Ledger(JournalEntryReport[LedgerRow]):
currency=currency, account=self.account, currency=currency, account=self.account,
period=self.period) period=self.period)
in_use: set[str] = set(db.session.scalars( in_use: sa.Select = sa.Select(JournalEntry.currency_code)\
sa.select(JournalEntry.currency_code) .group_by(JournalEntry.currency_code)
.group_by(JournalEntry.currency_code)).all())
return [OptionLink(str(x), get_url(x), x.code == self.currency.code) return [OptionLink(str(x), get_url(x), x.code == self.currency.code)
for x in Currency.query.filter(Currency.code.in_(in_use)) for x in Currency.query.filter(Currency.code.in_(in_use))
.order_by(Currency.code).all()] .order_by(Currency.code).all()]
@ -410,10 +409,9 @@ class Ledger(JournalEntryReport[LedgerRow]):
currency=self.currency, account=account, currency=self.currency, account=account,
period=self.period) period=self.period)
in_use: set[int] = set(db.session.scalars( in_use: sa.Select = sa.Select(JournalEntry.account_id)\
sa.select(JournalEntry.account_id) .filter(JournalEntry.currency_code == self.currency.code)\
.filter(JournalEntry.currency_code == self.currency.code) .group_by(JournalEntry.account_id)
.group_by(JournalEntry.account_id)).all())
return [OptionLink(str(x), get_url(x), x.id == self.account.id) return [OptionLink(str(x), get_url(x), x.id == self.account.id)
for x in Account.query.filter(Account.id.in_(in_use)) for x in Account.query.filter(Account.id.in_(in_use))
.order_by(Account.base_code, Account.no).all()] .order_by(Account.base_code, Account.no).all()]
@ -621,15 +619,14 @@ class IncomeExpenses(JournalEntryReport[IncomeExpensesRow]):
currency=self.currency, account=account, currency=self.currency, account=account,
period=self.period) period=self.period)
in_use: set[int] = set(db.session.scalars( in_use: sa.Select = sa.Select(JournalEntry.account_id)\
sa.Select(JournalEntry.account_id) .join(Account)\
.join(Account)
.filter(JournalEntry.currency_code == self.currency.code, .filter(JournalEntry.currency_code == self.currency.code,
sa.or_(Account.base_code.startswith("11"), sa.or_(Account.base_code.startswith("11"),
Account.base_code.startswith("12"), Account.base_code.startswith("12"),
Account.base_code.startswith("21"), Account.base_code.startswith("21"),
Account.base_code.startswith("22"))) Account.base_code.startswith("22")))\
.group_by(JournalEntry.account_id)).all()) .group_by(JournalEntry.account_id)
return [OptionLink(str(x), get_url(x), x.id == self.account.id) return [OptionLink(str(x), get_url(x), x.id == self.account.id)
for x in Account.query.filter(Account.id.in_(in_use)) for x in Account.query.filter(Account.id.in_(in_use))
.order_by(Account.base_code, Account.no).all()] .order_by(Account.base_code, Account.no).all()]