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

fix: Transaction type and description do not show in general ledger.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-08-12 21:08:02 +02:00
parent 79cc09fad9
commit ff94d8d9b2
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/interfaces/GeneralLedgerSheet.ts
View File

@@ -30,7 +30,7 @@ export interface IGeneralLedgerSheetAccountTransaction {
currencyCode: string; currencyCode: string;
note?: string; note?: string;
transactionType?: string; transactionTypeFormatted: string;
transactionNumber: string; transactionNumber: string;
referenceId?: number; referenceId?: number;

3
packages/server/src/services/Accounting/Ledger.ts
View File

@@ -249,6 +249,7 @@ export default class Ledger implements ILedger {
transactionId: entry.referenceId, transactionId: entry.referenceId,
transactionType: entry.referenceType, transactionType: entry.referenceType,
transactionSubType: entry.transactionType,
transactionNumber: entry.transactionNumber, transactionNumber: entry.transactionNumber,
referenceNumber: entry.referenceNumber, referenceNumber: entry.referenceNumber,
@@ -262,6 +263,8 @@ export default class Ledger implements ILedger {
taxRateId: entry.taxRateId, taxRateId: entry.taxRateId,
taxRate: entry.taxRate, taxRate: entry.taxRate,
note: entry.note,
}; };
} }

11
packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts
View File

@@ -15,6 +15,7 @@ import { FinancialSheetStructure } from '../FinancialSheetStructure';
import { flatToNestedArray } from '@/utils'; import { flatToNestedArray } from '@/utils';
import Ledger from '@/services/Accounting/Ledger'; import Ledger from '@/services/Accounting/Ledger';
import { calculateRunningBalance } from './_utils'; import { calculateRunningBalance } from './_utils';
import { getTransactionTypeLabel } from '@/utils/transactions-types';
/** /**
* General ledger sheet. * General ledger sheet.
@@ -90,11 +91,13 @@ export default class GeneralLedgerSheet extends R.compose(
date: entry.date, date: entry.date,
dateFormatted: moment(entry.date).format('YYYY MMM DD'), dateFormatted: moment(entry.date).format('YYYY MMM DD'),
transactionNumber: entry.transactionNumber, referenceType: entry.transactionType,
referenceType: entry.referenceType, referenceId: entry.transactionId,
referenceId: entry.referenceId,
referenceTypeFormatted: this.i18n.__(entry.referenceTypeFormatted),
transactionNumber: entry.transactionNumber,
transactionTypeFormatted: this.i18n.__(
getTransactionTypeLabel(entry.transactionType, entry.transactionSubType)
),
contactName: get(contact, 'displayName'), contactName: get(contact, 'displayName'),
contactType: get(contact, 'contactService'), contactType: get(contact, 'contactService'),

2
packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts
View File

@@ -67,7 +67,7 @@ export class GeneralLedgerTable extends R.compose(
return [ return [
{ key: 'date', accessor: 'dateFormatted' }, { key: 'date', accessor: 'dateFormatted' },
{ key: 'account_name', accessor: 'account.name' }, { key: 'account_name', accessor: 'account.name' },
{ key: 'reference_type', accessor: 'referenceTypeFormatted' }, { key: 'reference_type', accessor: 'transactionTypeFormatted' },
{ key: 'reference_number', accessor: 'transactionNumber' }, { key: 'reference_number', accessor: 'transactionNumber' },
{ key: 'description', accessor: 'note' }, { key: 'description', accessor: 'note' },
{ key: 'credit', accessor: 'formattedCredit' }, { key: 'credit', accessor: 'formattedCredit' },