From ff94d8d9b20375dbf4633f263b43c8ae44002cf0 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 12 Aug 2024 21:08:02 +0200 Subject: [PATCH] fix: Transaction type and description do not show in general ledger. --- packages/server/src/interfaces/GeneralLedgerSheet.ts | 2 +- packages/server/src/services/Accounting/Ledger.ts | 3 +++ .../GeneralLedger/GeneralLedger.ts | 11 +++++++---- .../GeneralLedger/GeneralLedgerTable.ts | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/server/src/interfaces/GeneralLedgerSheet.ts b/packages/server/src/interfaces/GeneralLedgerSheet.ts index 12f1e0883..68835a59e 100644 --- a/packages/server/src/interfaces/GeneralLedgerSheet.ts +++ b/packages/server/src/interfaces/GeneralLedgerSheet.ts @@ -30,7 +30,7 @@ export interface IGeneralLedgerSheetAccountTransaction { currencyCode: string; note?: string; - transactionType?: string; + transactionTypeFormatted: string; transactionNumber: string; referenceId?: number; diff --git a/packages/server/src/services/Accounting/Ledger.ts b/packages/server/src/services/Accounting/Ledger.ts index 3926ebe8f..155a61e10 100644 --- a/packages/server/src/services/Accounting/Ledger.ts +++ b/packages/server/src/services/Accounting/Ledger.ts @@ -249,6 +249,7 @@ export default class Ledger implements ILedger { transactionId: entry.referenceId, transactionType: entry.referenceType, + transactionSubType: entry.transactionType, transactionNumber: entry.transactionNumber, referenceNumber: entry.referenceNumber, @@ -262,6 +263,8 @@ export default class Ledger implements ILedger { taxRateId: entry.taxRateId, taxRate: entry.taxRate, + + note: entry.note, }; } diff --git a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts index 5ae2bba76..3a8a69bf0 100644 --- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts +++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts @@ -15,6 +15,7 @@ import { FinancialSheetStructure } from '../FinancialSheetStructure'; import { flatToNestedArray } from '@/utils'; import Ledger from '@/services/Accounting/Ledger'; import { calculateRunningBalance } from './_utils'; +import { getTransactionTypeLabel } from '@/utils/transactions-types'; /** * General ledger sheet. @@ -90,11 +91,13 @@ export default class GeneralLedgerSheet extends R.compose( date: entry.date, dateFormatted: moment(entry.date).format('YYYY MMM DD'), - transactionNumber: entry.transactionNumber, - referenceType: entry.referenceType, - referenceId: entry.referenceId, - referenceTypeFormatted: this.i18n.__(entry.referenceTypeFormatted), + referenceType: entry.transactionType, + referenceId: entry.transactionId, + transactionNumber: entry.transactionNumber, + transactionTypeFormatted: this.i18n.__( + getTransactionTypeLabel(entry.transactionType, entry.transactionSubType) + ), contactName: get(contact, 'displayName'), contactType: get(contact, 'contactService'), diff --git a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts index 80f05f77b..4ecb898e9 100644 --- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts +++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts @@ -67,7 +67,7 @@ export class GeneralLedgerTable extends R.compose( return [ { key: 'date', accessor: 'dateFormatted' }, { key: 'account_name', accessor: 'account.name' }, - { key: 'reference_type', accessor: 'referenceTypeFormatted' }, + { key: 'reference_type', accessor: 'transactionTypeFormatted' }, { key: 'reference_number', accessor: 'transactionNumber' }, { key: 'description', accessor: 'note' }, { key: 'credit', accessor: 'formattedCredit' },