Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
This commit is contained in:
commit
7ee95b6da2
|
@ -2110,7 +2110,7 @@ export class TransactionService {
|
||||||
.select('SUM(transaction_journal.amount) as total_expense')
|
.select('SUM(transaction_journal.amount) as total_expense')
|
||||||
.innerJoin('transactions.transactionJournal', 'transaction_journal')
|
.innerJoin('transactions.transactionJournal', 'transaction_journal')
|
||||||
.where(
|
.where(
|
||||||
`transaction_journal.type = '0' and transaction_journal.amount < product_price.price`,
|
`transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and partner_trx_id is NULL`,
|
||||||
)
|
)
|
||||||
.getRawOne();
|
.getRawOne();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user