Merge pull request #516 from bigcapitalhq/BIG-212

fix: Reorder 'debit' and 'credit' columns

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' },
     ];
   }
 

packages/webapp/src/containers/Accounting/MakeJournal/components.tsx

@@ -111,16 +111,16 @@ export const useJournalTableEntriesColumns = () => {
         fieldProps: { allowCreate: true },
       },
       {
-        Header: CreditHeaderCell,
+        Header: DebitHeaderCell,
-        accessor: 'credit',
+        accessor: 'debit',
         Cell: MoneyFieldCell,
         disableSortBy: true,
         width: 100,
         align: Align.Right,
       },
       {
-        Header: DebitHeaderCell,
+        Header: CreditHeaderCell,
-        accessor: 'debit',
+        accessor: 'credit',
         Cell: MoneyFieldCell,
         disableSortBy: true,
         width: 100,

packages/webapp/src/containers/Drawers/AccountDrawer/utils.tsx

@@ -26,6 +26,14 @@ export const useAccountReadEntriesColumns = () => {
         width: 100,
         textOverview: true,
       },
+      {
+        Header: intl.get('debit'),
+        accessor: isFCYCurrencyType ? 'formatted_fc_debit' : 'formatted_debit',
+        width: 80,
+        className: 'debit',
+        align: 'right',
+        textOverview: true,
+      },
       {
         Header: intl.get('credit'),
         accessor: isFCYCurrencyType
@@ -36,14 +44,6 @@ export const useAccountReadEntriesColumns = () => {
         align: 'right',
         textOverview: true,
       },
-      {
-        Header: intl.get('debit'),
-        accessor: isFCYCurrencyType ? 'formatted_fc_debit' : 'formatted_debit',
-        width: 80,
-        className: 'debit',
-        align: 'right',
-        textOverview: true,
-      },
     ],
     [isFCYCurrencyType],
   );

packages/webapp/src/containers/Drawers/ManualJournalDrawer/utils.tsx

@@ -82,20 +82,6 @@ export const useManualJournalEntriesColumns = () => {
             },
           ]
         : []),
-      {
-        Header: intl.get('credit'),
-        accessor: 'credit',
-        Cell: FormatNumberCell,
-        width: getColumnWidth(entries, 'credit', {
-          minWidth: 60,
-          magicSpacing: 5,
-        }),
-        disableResizable: true,
-        disableSortBy: true,
-        textOverview: true,
-        formatNumber: { noZero: true },
-        align: 'right',
-      },
       {
         Header: intl.get('debit'),
         accessor: 'debit',
@@ -110,6 +96,20 @@ export const useManualJournalEntriesColumns = () => {
         formatNumber: { noZero: true },
         align: 'right',
       },
+      {
+        Header: intl.get('credit'),
+        accessor: 'credit',
+        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'credit', {
+          minWidth: 60,
+          magicSpacing: 5,
+        }),
+        disableResizable: true,
+        disableSortBy: true,
+        textOverview: true,
+        formatNumber: { noZero: true },
+        align: 'right',
+      },
     ],
     [],
   );

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,
+      },
     ],
     [],
   );