diff --git a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts index 724e2ec2b..cb99ba646 100644 --- a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts +++ b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts @@ -50,8 +50,8 @@ export class JournalSheetTable extends R.compose( { key: 'description', accessor: 'entry.note' }, { key: 'account_code', accessor: 'entry.accountCode' }, { key: 'account_name', accessor: 'entry.accountName' }, - { key: 'credit', accessor: 'entry.formattedCredit' }, { key: 'debit', accessor: 'entry.formattedDebit' }, + { key: 'credit', accessor: 'entry.formattedCredit' }, ]; }; @@ -67,8 +67,8 @@ export class JournalSheetTable extends R.compose( { key: 'description', accessor: 'note' }, { key: 'account_code', accessor: 'accountCode' }, { key: 'account_name', accessor: 'accountName' }, - { key: 'credit', accessor: 'formattedCredit' }, { key: 'debit', accessor: 'formattedDebit' }, + { key: 'credit', accessor: 'formattedCredit' }, ]; }; @@ -84,8 +84,8 @@ export class JournalSheetTable extends R.compose( { key: 'description', accessor: '_empty_' }, { key: 'account_code', accessor: '_empty_' }, { key: 'account_name', accessor: '_empty_' }, - { key: 'credit', accessor: 'formattedCredit' }, { key: 'debit', accessor: 'formattedDebit' }, + { key: 'credit', accessor: 'formattedCredit' }, ]; }; @@ -101,8 +101,8 @@ export class JournalSheetTable extends R.compose( { key: 'description', value: '' }, { key: 'account_code', value: '' }, { key: 'account_name', value: '' }, - { key: 'credit', value: '' }, { key: 'debit', value: '' }, + { key: 'credit', value: '' }, ]; }; @@ -118,8 +118,8 @@ export class JournalSheetTable extends R.compose( { key: 'description', label: 'Description' }, { key: 'account_code', label: 'Acc. Code' }, { key: 'account_name', label: 'Account' }, - { key: 'credit', label: 'Credit' }, { key: 'debit', label: 'Debit' }, + { key: 'credit', label: 'Credit' }, ]; } diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx index ab6d07bae..d146bbb08 100644 --- a/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx +++ b/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx @@ -111,16 +111,16 @@ export const useJournalTableEntriesColumns = () => { fieldProps: { allowCreate: true }, }, { - Header: CreditHeaderCell, - accessor: 'credit', + Header: DebitHeaderCell, + accessor: 'debit', Cell: MoneyFieldCell, disableSortBy: true, width: 100, align: Align.Right, }, { - Header: DebitHeaderCell, - accessor: 'debit', + Header: CreditHeaderCell, + accessor: 'credit', Cell: MoneyFieldCell, disableSortBy: true, width: 100, diff --git a/packages/webapp/src/containers/Drawers/AccountDrawer/utils.tsx b/packages/webapp/src/containers/Drawers/AccountDrawer/utils.tsx index 564c4fdc7..1a0312a20 100644 --- a/packages/webapp/src/containers/Drawers/AccountDrawer/utils.tsx +++ b/packages/webapp/src/containers/Drawers/AccountDrawer/utils.tsx @@ -27,20 +27,20 @@ export const useAccountReadEntriesColumns = () => { textOverview: true, }, { - Header: intl.get('credit'), - accessor: isFCYCurrencyType - ? 'formatted_fc_credit' - : 'formatted_credit', + Header: intl.get('debit'), + accessor: isFCYCurrencyType ? 'formatted_fc_debit' : 'formatted_debit', width: 80, - className: 'credit', + className: 'debit', align: 'right', textOverview: true, }, { - Header: intl.get('debit'), - accessor: isFCYCurrencyType ? 'formatted_fc_debit' : 'formatted_debit', + Header: intl.get('credit'), + accessor: isFCYCurrencyType + ? 'formatted_fc_credit' + : 'formatted_credit', width: 80, - className: 'debit', + className: 'credit', align: 'right', textOverview: true, }, diff --git a/packages/webapp/src/containers/Drawers/ManualJournalDrawer/utils.tsx b/packages/webapp/src/containers/Drawers/ManualJournalDrawer/utils.tsx index 8ca521ed0..2474cf3a8 100644 --- a/packages/webapp/src/containers/Drawers/ManualJournalDrawer/utils.tsx +++ b/packages/webapp/src/containers/Drawers/ManualJournalDrawer/utils.tsx @@ -83,30 +83,30 @@ export const useManualJournalEntriesColumns = () => { ] : []), { - Header: intl.get('credit'), - accessor: 'credit', + Header: intl.get('debit'), + accessor: 'debit', Cell: FormatNumberCell, - width: getColumnWidth(entries, 'credit', { + width: getColumnWidth(entries, 'debit', { minWidth: 60, magicSpacing: 5, }), disableResizable: true, - disableSortBy: true, textOverview: true, + disableSortBy: true, formatNumber: { noZero: true }, align: 'right', }, { - Header: intl.get('debit'), - accessor: 'debit', + Header: intl.get('credit'), + accessor: 'credit', Cell: FormatNumberCell, - width: getColumnWidth(entries, 'debit', { + width: getColumnWidth(entries, 'credit', { minWidth: 60, magicSpacing: 5, }), disableResizable: true, - textOverview: true, disableSortBy: true, + textOverview: true, formatNumber: { noZero: true }, align: 'right', }, diff --git a/packages/webapp/src/containers/JournalEntriesTable/utils.tsx b/packages/webapp/src/containers/JournalEntriesTable/utils.tsx index 62f9d151a..0340af5fb 100644 --- a/packages/webapp/src/containers/JournalEntriesTable/utils.tsx +++ b/packages/webapp/src/containers/JournalEntriesTable/utils.tsx @@ -25,14 +25,6 @@ export const useGLEntriesTableColumns = () => { width: 140, textOverview: true, }, - { - Header: intl.get('credit'), - accessor: ({ credit }) => credit.formatted_amount, - width: 100, - className: 'credit', - align: 'right', - textOverview: true, - }, { Header: intl.get('debit'), accessor: ({ debit }) => debit.formatted_amount, @@ -41,6 +33,14 @@ export const useGLEntriesTableColumns = () => { textOverview: true, align: 'right', }, + { + Header: intl.get('credit'), + accessor: ({ credit }) => credit.formatted_amount, + width: 100, + className: 'credit', + align: 'right', + textOverview: true, + }, ], [], );