diff --git a/packages/webapp/src/containers/FinancialStatements/AgingSummary/dynamicColumns.ts b/packages/webapp/src/containers/FinancialStatements/AgingSummary/dynamicColumns.ts index 971bdadb7..7d04a67ca 100644 --- a/packages/webapp/src/containers/FinancialStatements/AgingSummary/dynamicColumns.ts +++ b/packages/webapp/src/containers/FinancialStatements/AgingSummary/dynamicColumns.ts @@ -1,5 +1,4 @@ // @ts-nocheck -import React, { useMemo } from 'react'; import * as R from 'ramda'; import { getColumnWidth } from '@/utils'; import { Align } from '@/constants'; @@ -25,6 +24,7 @@ const currentAccessor = R.curry((data, column) => { className: column.id, width: getColumnWidth(data, accessor, { minWidth: 120 }), align: Align.Right, + money: true, }; }); @@ -38,6 +38,7 @@ const totalAccessor = R.curry((data, column) => { className: column.key, width: getColumnWidth(data, accessor, { minWidth: 120 }), align: Align.Right, + money: true, }; }); @@ -51,6 +52,7 @@ const agingPeriodAccessor = R.curry((data, column) => { className: column.key, width: getColumnWidth(data, accessor, { minWidth: 120 }), align: Align.Right, + money: true, }; }); diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/dynamicColumns.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/dynamicColumns.tsx index bb49f7b96..326c69ea9 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/dynamicColumns.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/dynamicColumns.tsx @@ -3,7 +3,6 @@ import * as R from 'ramda'; import { isEmpty } from 'lodash'; import { Align } from '@/constants'; -import { CellTextSpan } from '@/components/Datatable/Cells'; import { getColumnWidth } from '@/utils'; const getTableCellValueAccessor = (index) => `cells[${index}].value`; @@ -12,12 +11,11 @@ const getReportColWidth = (data, accessor, headerText) => { return getColumnWidth( data, accessor, - { magicSpacing: 10, minWidth: 100 }, + { magicSpacing: 12, minWidth: 100 }, headerText, ); }; - /** * Account name column mapper. */ @@ -77,6 +75,7 @@ const dateRangeMapper = R.curry((data, column) => { key: column.key, disableSortBy: true, textOverview: true, + money: true, align: isDateColumnHasColumns ? Align.Center : Align.Right, }; return R.compose( @@ -104,9 +103,9 @@ const totalMapper = R.curry((data, column) => { Header: column.label, accessor, textOverview: true, - Cell: CellTextSpan, width, disableSortBy: true, + money: true, align: hasChildren ? Align.Center : Align.Right, }; return R.compose( @@ -129,6 +128,7 @@ const percentageOfColumnAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -147,6 +147,7 @@ const percentageOfRowAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -165,6 +166,7 @@ const previousYearAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -183,6 +185,7 @@ const previousYearChangeAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -201,6 +204,7 @@ const previousYearPercentageAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -219,6 +223,7 @@ const previousPeriodAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -237,6 +242,7 @@ const previousPeriodChangeAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); @@ -255,6 +261,7 @@ const previousPeriodPercentageAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true, }; }); diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx index 1ca58cfe6..d1fc6c7c4 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx @@ -29,6 +29,7 @@ const numericColumn = R.curry((data, index, column) => ({ }), disableSortBy: true, align: Align.Right, + money: true, })); const columnsMapper = R.curry((data, index, column) => ({ diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/dynamicColumns.ts b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/dynamicColumns.ts index f0bf677ee..2a05407e5 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/dynamicColumns.ts +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/dynamicColumns.ts @@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => { return { ...column, align: Align.Right, + money: true, width, }; }); diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.tsx index 69f7a482c..e3204b62f 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.tsx @@ -154,6 +154,7 @@ export function useVendorsCreditNoteTableColumns() { clickable: true, textOverview: true, disableSortBy: true, + money: true, className: clsx(CLASSES.FONT_BOLD), }, { diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/components.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/components.tsx index c7291d222..094954505 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/components.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/components.tsx @@ -117,6 +117,7 @@ export function usePaymentMadesTableColumns() { className: 'amount', align: 'right', clickable: true, + money: true, }, { id: 'reference_no', diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/components.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/components.tsx index ac03aad54..4c844863b 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/components.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/components.tsx @@ -113,6 +113,7 @@ export function usePaymentReceivesColumns() { align: 'right', clickable: true, textOverview: true, + money: true, className: clsx(CLASSES.FONT_BOLD), }, {