Fixed the journal, the ledger, the income ane expenses log, and the search result to respect the transaction number before the debit/credit and the journal entry nuber.
This commit is contained in:
		| @@ -160,6 +160,7 @@ class EntryCollector: | ||||
|                         JournalEntry.currency_code == self.__currency.code, | ||||
|                         sa.not_(self.__account_condition)) | ||||
|                 .order_by(Transaction.date, | ||||
|                           Transaction.no, | ||||
|                           JournalEntry.is_debit, | ||||
|                           JournalEntry.no) | ||||
|                 .options(selectinload(JournalEntry.account), | ||||
|   | ||||
| @@ -188,6 +188,7 @@ class Journal(BaseReport): | ||||
|         return JournalEntry.query.join(Transaction)\ | ||||
|             .filter(*conditions)\ | ||||
|             .order_by(Transaction.date, | ||||
|                       Transaction.no, | ||||
|                       JournalEntry.is_debit.desc(), | ||||
|                       JournalEntry.no)\ | ||||
|             .options(selectinload(JournalEntry.account), | ||||
|   | ||||
| @@ -149,6 +149,7 @@ class EntryCollector: | ||||
|         return [ReportEntry(x) for x in JournalEntry.query.join(Transaction) | ||||
|                 .filter(*conditions) | ||||
|                 .order_by(Transaction.date, | ||||
|                           Transaction.no, | ||||
|                           JournalEntry.is_debit.desc(), | ||||
|                           JournalEntry.no) | ||||
|                 .options(selectinload(JournalEntry.transaction)).all()] | ||||
|   | ||||
| @@ -71,6 +71,7 @@ class EntryCollector: | ||||
|             conditions.append(sa.or_(*sub_conditions)) | ||||
|         return JournalEntry.query.join(Transaction).filter(*conditions)\ | ||||
|             .order_by(Transaction.date, | ||||
|                       Transaction.no, | ||||
|                       JournalEntry.is_debit, | ||||
|                       JournalEntry.no)\ | ||||
|             .options(selectinload(JournalEntry.account), | ||||
|   | ||||
		Reference in New Issue
	
	Block a user