mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-15 20:30:33 +00:00
fix: Transaction type and description do not show in general ledger.
This commit is contained in:
@@ -30,7 +30,7 @@ export interface IGeneralLedgerSheetAccountTransaction {
|
||||
currencyCode: string;
|
||||
note?: string;
|
||||
|
||||
transactionType?: string;
|
||||
transactionTypeFormatted: string;
|
||||
transactionNumber: string;
|
||||
|
||||
referenceId?: number;
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -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'),
|
||||
|
||||
|
||||
@@ -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' },
|
||||
|
||||
Reference in New Issue
Block a user