Added the order to the search report.

2023-03-11 01:01:05 +08:00 · 2023-03-11 01:01:05 +08:00 · a0fba6387f
commit a0fba6387f
parent d28bdf2064
1 changed files with 4 additions and 1 deletions
--- a/src/accounting/report/reports/search.py
+++ b/src/accounting/report/reports/search.py
@ -68,7 +68,10 @@ class EntryCollector:
            except ArithmeticError:
                pass
            conditions.append(sa.or_(*sub_conditions))
-        return JournalEntry.query.filter(*conditions)\
+        return JournalEntry.query.join(Transaction).filter(*conditions)\
+            .order_by(Transaction.date,
+                      JournalEntry.is_debit,
+                      JournalEntry.no)\
            .options(selectinload(JournalEntry.account),
                     selectinload(JournalEntry.currency),
                     selectinload(JournalEntry.transaction)).all()