QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 13:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into filter-uncategorized-bank-transactions

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-08-22 00:12:37 +02:00
parent df8b68fda6 f46cd28f87
commit bf3a70cabd
320 changed files with 3212 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/services/Cashflow/GetRecongizedTransactions.ts
View File

@@ -34,8 +34,13 @@ export class GetRecognizedTransactionsService {
q.withGraphFetched('recognizedTransaction.assignAccount');
q.withGraphFetched('recognizedTransaction.bankRule');
q.whereNotNull('recognizedTransactionId');
// Exclude the excluded transactions.
q.modify('notExcluded');
// Exclude the pending transactions.
q.modify('notPending');
if (_query.accountId) {
q.where('accountId', _query.accountId);
}
@@ -51,6 +56,9 @@ export class GetRecognizedTransactionsService {
if (_query.maxAmount) {
q.modify('maxAmount', _query.maxAmount);
}
if (_query.accountId) {
q.where('accountId', _query.accountId);
}
})
.pagination(_query.page - 1, _query.pageSize);