Merge branch 'develop' into main

.env.example

@@ -0,0 +1 @@
+APP_VERSION=$npm_package_version

.gitignore

@@ -13,6 +13,7 @@
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local

CHANGELOG.md

@@ -2,8 +2,17 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+## [1.5.3] - 03-01-2020
+
+### Fixed
+
+- Localize the global errors.
+- Expand account name column on trial balance sheet.
+
 ## [1.5.0] - 20-12-2021
+
 ### Added
+
 - Add credit note on sales module.
 - Add vendor credit on purchases module.
 - Optimize landed costs on purchase invoices.
@@ -15,23 +24,29 @@ All notable changes to Bigcapital server-side will be in this file.
 - Optimize readonly details style of invoice, receipt, estimate, payment receive,
   purchase invoice, expense, manual journal, inventory adjustment and cashflow transaction.
 
-### Changed 
+### Changed
+
 - Dashboard meta boot and authenticated user request query.
+- Optimize Arabic localization.
 
 ## [1.4.0] - 11-09-2021
 
 ### Added
+
 - Add SMS notification on sale invoice, receipt, customers payments modules.
 - Customer quick create in customers list.
 - Item quick create in items list.
 
 ### Changes
- change: BIG-171 alerts in global scope and lazy loading.
+
+change: BIG-171 alerts in global scope and lazy loading.
+
 ### Fixed
- fix: BIG-140 - Reordering sell, cost and inventory account on item details.
- fix: BIG-144 - Typo adjustment dialog success message.
- fix: BIG-148 - Items entries ordered by index.
- fix: BIG-132 AR/AP aging summary report filter by none transactions/zero contacts.
+
+fix: BIG-140 - Reordering sell, cost and inventory account on item details.
+fix: BIG-144 - Typo adjustment dialog success message.
+fix: BIG-148 - Items entries ordered by index.
+fix: BIG-132 AR/AP aging summary report filter by none transactions/zero contacts.
 
 ## [1.2.0-RC] - 03-09-2021
 
@@ -39,6 +54,7 @@ Here we write upgrading notes for brands. It's a team effort to make them as
 straightforward as possible.
 
 ### Added
+
 - Add slidable sub-sidebar to improve user experience instead of sub-menu.
 - Add Subscription guard to ensure the organization's subscription is active or
   redirect all routes to subscription billing page.
@@ -62,14 +78,16 @@ straightforward as possible.
 - Inventory adjustment publish action.
 - Customers and vendors activate and inactivate action.
 - Add refresh button on dashboard actions bar to all datatables resources.
-- Add clickable datatable rows to display each row details. 
+- Add clickable datatable rows to display each row details.
 
 ### Changed
+
 - Optimize style of datatable selection checkbox.
 - Disable animation in dashboard views tabs.
 - Optimize Arabic localization.
 
 ### Fixed
+
 - fix: disable submit buttons in pereferences pages.
 - fix: inventory adjustment cost field max/min range to avoid out of range error.
 - fix: transactions by customers/vendors report localization.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigcapital-client",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "private": true,
   "dependencies": {
     "@babel/core": "7.8.4",

src/containers/FinancialStatements/TrialBalanceSheet/components.js

@@ -11,8 +11,6 @@ import FinancialLoadingBar from '../FinancialLoadingBar';
  * Retrieve trial balance sheet table columns.
  */
 export const useTrialBalanceTableColumns = () => {
-  
-
   // Trial balance sheet context.
   const {
     trialBalanceSheet: { tableRows },
@@ -24,7 +22,7 @@ export const useTrialBalanceTableColumns = () => {
         Header: intl.get('account_name'),
         accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name),
         className: 'name',
-        width: 180,
+        width: 350,
         textOverview: true,
       },
       {
@@ -35,12 +33,14 @@ export const useTrialBalanceTableColumns = () => {
         width: getColumnWidth(tableRows, `credit`, {
           minWidth: 80,
         }),
+        textOverview: true,
       },
       {
         Header: intl.get('debit'),
         Cell: CellTextSpan,
         accessor: 'formatted_debit',
         width: getColumnWidth(tableRows, `debit`, { minWidth: 80 }),
+        textOverview: true,
       },
       {
         Header: intl.get('balance'),
@@ -50,6 +50,7 @@ export const useTrialBalanceTableColumns = () => {
         width: getColumnWidth(tableRows, `balance`, {
           minWidth: 80,
         }),
+        textOverview: true,
       },
     ],
     [tableRows],

src/containers/GlobalErrors/GlobalErrors.js

@@ -43,7 +43,7 @@ function GlobalErrors({
   if (globalErrors.access_denied) {
     toastKeySomethingWrong = AppToaster.show(
       {
-        message: 'You do not have permissions to access this page.',
+        message: intl.get('global_error.you_dont_have_permissions'),
         intent: Intent.DANGER,
         onDismiss: () => {
           globalErrorsSet({ access_denied: false });
@@ -53,11 +53,10 @@ function GlobalErrors({
     );
   }
   if (globalErrors.transactionsLocked) {
-    const lockedToDate =
-      globalErrors.transactionsLocked.formatted_locked_to_date;
-
     AppToaster.show({
-      message: `Transactions before ${lockedToDate} has been locked. Hence action cannot be performed.`,
+      message: intl.get('global_error.transactions_locked', {
+        lockedToDate: globalErrors.transactionsLocked.formatted_locked_to_date,
+      }),
       intent: Intent.DANGER,
       onDismiss: () => {
         globalErrorsSet({ transactionsLocked: false });
@@ -66,7 +65,7 @@ function GlobalErrors({
   }
   if (globalErrors.userInactive) {
     AppToaster.show({
-      message: 'The authorized user is inactive.',
+      message: intl.get('global_error.authorized_user_inactive'),
       intent: Intent.DANGER,
       onDismiss: () => {
         globalErrorsSet({ userInactive: false });

src/lang/ar/index.json

@@ -1753,5 +1753,9 @@
   "payment_receive.drawer.title": "تفاصيل سند الزبون ({number})",
   "payment_made.drawer.title": "تفاصيل سند المورد {number}",
   "manual_journal.drawer.title": "تفاصيل قيد يدوي ({number})",
-  "expense.drawer.title": " تفاصيل المصروف"
+  "expense.drawer.title": " تفاصيل المصروف",
+
+  "global_error.you_dont_have_permissions": "ليس لديك صلاحية الوصول إلى هذه الصفحة.",
+  "global_error.transactions_locked": "تم قفل المعاملات التي تمت قبل {lockedToDate}. ومن ثم لا يمكن القيام بأي عمل.",
+  "global_error.authorized_user_inactive": "المستخدم المصرح له تم تعطيلة."
 }

src/lang/en/index.json

@@ -1733,5 +1733,9 @@
   "payment_receive.drawer.title": "Payment receive details ({number})",
   "payment_made.drawer.title": "Payment made details {number}",
   "manual_journal.drawer.title": "Manual journal details ({number})",
-  "expense.drawer.title": "Expense details"
+  "expense.drawer.title": "Expense details",
+
+  "global_error.you_dont_have_permissions": "You do not have permissions to access this page.",
+  "global_error.transactions_locked": "Transactions before {lockedToDate} has been locked. Hence action cannot be performed.",
+  "global_error.authorized_user_inactive": "The authorized user is inactive."
 }