fix(Journal): account balance with journal entries.

This commit is contained in:
a.bouhuolia
2021-03-25 12:46:36 +02:00
parent e6e165efe4
commit 40b2ba099e
9 changed files with 37 additions and 16 deletions

View File

@@ -72,7 +72,14 @@ export default class Bill extends TenantModel {
*/
fromDate(query, fromDate) {
query.where('bill_date', '<=', fromDate)
}
},
/**
* Sort the bills by full-payment bills.
*/
sortByStatus(query, order) {
query.orderByRaw(`PAYMENT_AMOUNT = AMOUNT ${order}`);
},
};
}
@@ -299,6 +306,9 @@ export default class Bill extends TenantModel {
break;
}
},
sortQuery(query, role) {
query.modify('sortByStatus', role.order);
},
},
amount: {
label: 'Amount',

View File

@@ -278,13 +278,13 @@ export default class JournalPoster implements IJournalPoster {
let change = 0;
if (accountChange.credit) {
change =
change +=
normal === 'credit'
? accountChange.credit
: -1 * accountChange.credit;
}
if (accountChange.debit) {
change =
change +=
normal === 'debit' ? accountChange.debit : -1 * accountChange.debit;
}
mappedList.push({ account, change });

View File

@@ -424,7 +424,7 @@ export default class ManualJournalsService implements IManualJournalsService {
'[manual_journal] trying to save manual journal to the storage.',
{ tenantId, manualJournalDTO }
);
// Upsert the manual journal object.
const manualJournal = await ManualJournal.query().upsertGraph({
...manualJournalObj,
});
@@ -492,7 +492,7 @@ export default class ManualJournalsService implements IManualJournalsService {
tenantId,
manualJournalDTO.entries
);
await ManualJournal.query().upsertGraph({
...manualJournalObj,
});
@@ -797,7 +797,7 @@ export default class ManualJournalsService implements IManualJournalsService {
return manualJournal;
}
/**
* Reverts the manual journal journal entries.
* @param {number} tenantId