fix(Journal): account balance with journal entries.

client/src/components/Preferences/PreferencesContentRoute.js

@@ -4,12 +4,9 @@ import preferencesRoutes from 'routes/preferences'
 
 
 export default function DashboardContentRoute() {
-  const defaultTab = '/preferences/general';
  
   return (
     <Route pathname="/preferences">
-      <Redirect from='/preferences' to={defaultTab} />
-
       <Switch>
         { preferencesRoutes.map((route, index) => (
           <Route

client/src/containers/FinancialStatements/TrialBalanceSheet/components.js

@@ -24,7 +24,7 @@ export const useTrialBalanceTableColumns = () => {
         Header: formatMessage({ id: 'account_name' }),
         accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name),
         className: 'name',
-        width: 160,
+        width: 180,
         textOverview: true,
       },
       {
@@ -33,14 +33,14 @@ export const useTrialBalanceTableColumns = () => {
         accessor: 'formatted_credit',
         className: 'credit',
         width: getColumnWidth(tableRows, `credit`, {
-          minWidth: 95,
+          minWidth: 80,
         }),
       },
       {
         Header: formatMessage({ id: 'debit' }),
         Cell: CellTextSpan,
         accessor: 'formatted_debit',
-        width: getColumnWidth(tableRows, `debit`, { minWidth: 95 }),
+        width: getColumnWidth(tableRows, `debit`, { minWidth: 80 }),
       },
       {
         Header: formatMessage({ id: 'balance' }),
@@ -48,7 +48,7 @@ export const useTrialBalanceTableColumns = () => {
         accessor: 'formatted_balance',
         className: 'balance',
         width: getColumnWidth(tableRows, `balance`, {
-          minWidth: 95,
+          minWidth: 80,
         }),
       },
     ],

client/src/containers/Preferences/DefaultRoute.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import { Redirect } from 'react-router-dom';
+
+export default function DefaultRoute() {
+  const defaultTab = '/preferences/general';
+
+  return (<Redirect from='/preferences' to={defaultTab} />);
+}

client/src/routes/preferences.js

@@ -4,6 +4,7 @@ import Accountant from 'containers/Preferences/Accountant/Accountant';
 import Accounts from 'containers/Preferences/Accounts/Accounts';
 import Currencies from 'containers/Preferences/Currencies/Currencies';
 import Item from 'containers/Preferences/Item/Item';
+import DefaultRoute from '../containers/Preferences/DefaultRoute';
 
 const BASE_URL = '/preferences';
 
@@ -33,4 +34,9 @@ export default [
     component: Item,
     exact: true,
   },
+  {
+    path: `${BASE_URL}/`,
+    component: DefaultRoute,
+    exact: true,
+  },
 ];

client/src/style/pages/FinancialStatements/Journal.scss

@@ -36,7 +36,7 @@
           font-weight: 600;
         }
 
-        .tr{
+        .tr:not(.no-results) {
           height: 28px;
         }
 

client/src/utils.js

@@ -160,7 +160,7 @@ export function formattedAmount(cents, currency, props) {
     precision: 0,
     format: {
       pos: '%s%v',
-      neg: '%s%v',
+      neg: '%s-%v',
       zero: parsedProps.noZero ? '' : '%s%v',
     },
   };

server/src/models/Bill.js

@@ -72,7 +72,14 @@ export default class Bill extends TenantModel {
        */
       fromDate(query, fromDate) {
         query.where('bill_date', '<=', fromDate)
-      }
+      },
+
+      /**
+       * Sort the bills by full-payment bills.
+       */
+       sortByStatus(query, order) {
+        query.orderByRaw(`PAYMENT_AMOUNT = AMOUNT ${order}`);
+      },
     };
   }
 
@@ -299,6 +306,9 @@ export default class Bill extends TenantModel {
               break;
           }
         },
+        sortQuery(query, role) {
+          query.modify('sortByStatus', role.order);
+        },
       },
       amount: {
         label: 'Amount',

server/src/services/Accounting/JournalPoster.ts

@@ -278,13 +278,13 @@ export default class JournalPoster implements IJournalPoster {
         let change = 0;
 
         if (accountChange.credit) {
-          change =
+          change +=
             normal === 'credit'
               ? accountChange.credit
               : -1 * accountChange.credit;
         }
         if (accountChange.debit) {
-          change =
+          change +=
             normal === 'debit' ? accountChange.debit : -1 * accountChange.debit;
         }
         mappedList.push({ account, change });

server/src/services/ManualJournals/ManualJournalsService.ts

@@ -424,7 +424,7 @@ export default class ManualJournalsService implements IManualJournalsService {
       '[manual_journal] trying to save manual journal to the storage.',
       { tenantId, manualJournalDTO }
     );
-
+    // Upsert the manual journal object.
     const manualJournal = await ManualJournal.query().upsertGraph({
       ...manualJournalObj,
     });