diff --git a/packages/server/src/interfaces/Ledger.ts b/packages/server/src/interfaces/Ledger.ts index 4e021718a..8af6ac8b8 100644 --- a/packages/server/src/interfaces/Ledger.ts +++ b/packages/server/src/interfaces/Ledger.ts @@ -41,6 +41,8 @@ export interface ILedgerEntry { index: number; indexGroup?: number; + note?: string; + userId?: number; itemId?: number; branchId?: number; diff --git a/packages/server/src/services/Accounting/utils.ts b/packages/server/src/services/Accounting/utils.ts index 081a0d14c..45a3de94e 100644 --- a/packages/server/src/services/Accounting/utils.ts +++ b/packages/server/src/services/Accounting/utils.ts @@ -21,6 +21,8 @@ export const transformLedgerEntryToTransaction = ( transactionNumber: entry.transactionNumber, referenceNumber: entry.referenceNumber, + note: entry.note, + index: entry.index, indexGroup: entry.indexGroup, diff --git a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts index 93d23e3b1..21df84f34 100644 --- a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts +++ b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts @@ -25,8 +25,8 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the common entry of cashflow transaction. - * @param {ICashflowTransaction} cashflowTransaction - * @returns {} + * @param {ICashflowTransaction} cashflowTransaction + * @returns {Partial} */ private getCommonEntry = (cashflowTransaction: ICashflowTransaction) => { const { entries, ...transaction } = cashflowTransaction; @@ -41,7 +41,9 @@ export default class CashflowTransactionJournalEntries { ), transactionId: transaction.id, transactionNumber: transaction.transactionNumber, - referenceNo: transaction.referenceNo, + referenceNumber: transaction.referenceNo, + + note: transaction.description, branchId: cashflowTransaction.branchId, userId: cashflowTransaction.userId, @@ -76,9 +78,9 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the cashflow credit GL entry. - * @param {ICashflowTransaction} cashflowTransaction - * @param {ICashflowTransactionLine} entry - * @param {number} index + * @param {ICashflowTransaction} cashflowTransaction + * @param {ICashflowTransactionLine} entry + * @param {number} index * @returns {ILedgerEntry} */ private getCashflowCreditGLEntry = ( @@ -102,10 +104,10 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the cashflow transaction GL entry. - * @param {ICashflowTransaction} cashflowTransaction - * @param {ICashflowTransactionLine} entry - * @param {number} index - * @returns + * @param {ICashflowTransaction} cashflowTransaction + * @param {ICashflowTransactionLine} entry + * @param {number} index + * @returns {ILedgerEntry[]} */ private getJournalEntries = ( cashflowTransaction: ICashflowTransaction @@ -118,7 +120,7 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the cashflow GL ledger. - * @param {ICashflowTransaction} cashflowTransaction + * @param {ICashflowTransaction} cashflowTransaction * @returns {Ledger} */ private getCashflowLedger = (cashflowTransaction: ICashflowTransaction) => { @@ -130,6 +132,7 @@ export default class CashflowTransactionJournalEntries { * Write the journal entries of the given cashflow transaction. * @param {number} tenantId * @param {ICashflowTransaction} cashflowTransaction + * @return {Promise} */ public writeJournalEntries = async ( tenantId: number, @@ -153,6 +156,7 @@ export default class CashflowTransactionJournalEntries { * Delete the journal entries. * @param {number} tenantId - Tenant id. * @param {number} cashflowTransactionId - Cashflow transaction id. + * @return {Promise} */ public revertJournalEntries = async ( tenantId: number,