Merge branch 'main' of https://github.com/bigcapitalhq/client into main

Merge `develop` to `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-140 - Reordering sell, cost and inventory account on item details.
- fix: BIG-148 - Items entries ordered by index.
+fix: BIG-144 - Typo adjustment dialog success message.
- fix: BIG-132 AR/AP aging summary report filter by none transactions/zero contacts.
+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.2.0",
+  "version": "1.5.3",
   "private": true,
   "dependencies": {
     "@babel/core": "7.8.4",

src/components/Sidebar/Sidebar.js

@@ -1,4 +1,5 @@
 import React from 'react';
+
 import SidebarContainer from 'components/Sidebar/SidebarContainer';
 import SidebarHead from 'components/Sidebar/SidebarHead';
 import SidebarMenu from 'components/Sidebar/SidebarMenu';
@@ -17,7 +18,20 @@ export default function Sidebar({ dashboardContentRef }) {
         <SidebarMenu menu={menu} />
       </div>
 
-      <div class="sidebar__version">0.0.1-beta version.</div>
+      <SidebarFooterVersion />
     </SidebarContainer>
   );
 }
+
+/**
+ * Sidebar footer version. 
+ * @returns {React.JSX}
+ */
+function SidebarFooterVersion() {
+  const { REACT_APP_VERSION: VERSION } = process.env;
+
+  if (!VERSION) {
+    return null;
+  }
+  return <div class="sidebar__version">v{VERSION}</div>;
+}

src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js

@@ -57,9 +57,7 @@ function BillTransactionDeleteAlert({
       loading={isLoading}
     >
       <p>
-        <T
+        <T id={`landed_cost.once_your_delete_this_located_landed_cost`} />
-          id={`Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?`}
-        />
       </p>
     </Alert>
   );

src/containers/CashFlow/AccountTransactions/utils.js

@@ -79,6 +79,10 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => {
       return openDrawer('refund-vendor-detail-drawer', {
         refundTransactionId: reference.reference_id,
       });
+    case 'InventoryAdjustment':
+      return openDrawer('inventory-adjustment-drawer', {
+        inventoryId: reference.reference_id,
+      });
 
     default:
       return openDrawer('cashflow-transaction-drawer', {

src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js

@@ -37,7 +37,7 @@ function AllocateLandedCostFloatingActions({
       <DialogFooterActions alignment={'left'}>
         {costTransactionEntry && (
           <UnallocatedAmount>
-            Unallocated cost Amount:{' '}
+           <T id={'landed_cost.dialog.label_unallocated_cost_amount'}/>
             <strong>{formattedUnallocatedCostAmount}</strong>
           </UnallocatedAmount>
         )}

src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js

@@ -42,7 +42,10 @@ function AllocateLandedCostForm({
       .map((entry) => transformToForm(entry, defaultInitialValues.items[0]));
 
     if (entries.length <= 0) {
-      AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER });
+      AppToaster.show({
+        message: intl.get('something_wrong'),
+        intent: Intent.DANGER,
+      });
       return;
     }
     const form = {
@@ -69,13 +72,14 @@ function AllocateLandedCostForm({
         )
       ) {
         AppToaster.show({
-          message:
+          message: intl.get(
-            'The total located cost is bigger than the transaction line.',
+            'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line',
+          ),
           intent: Intent.DANGER,
         });
       } else {
         AppToaster.show({
-          message: 'Something went wrong!',
+          message: intl.get('something_went_wrong'),
           intent: Intent.DANGER,
         });
       }

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

@@ -1173,7 +1173,6 @@
   "From transaction": "من معاملة",
   "Landed": "Landed",
   "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "يتيح لك هذا الخيار إمكانية إضافة تكلفة إضافية على سبيل المثال اضافة تكلفة الشحن ومن ثم تخصيص التكلفة لفواتير الشراء.",
-  "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟",
   "journal_entries": "القيود",
   "contact": "جهة الاتصال",
   "invoice_details": "تفاصيل الفاتورة",
@@ -1384,7 +1383,7 @@
   "filter.value": "قيمة",
   "payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.",
   "estimate.delete.error.estimate_converted_to_invoice": "لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.",
-  "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.",
+  "landed_cost.action.delete.success_message": "تم حذف تكلفة اضافية بنجاح. ",
   "items.option.only_active": "Only active",
   "items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.",
   "items.option_with_transactions": "الاصناف مع معاملات",
@@ -1583,6 +1582,9 @@
   "refund": "استرجاع",
   "landed_cost.dialog.label_select_transaction": "حدد المعاملة ",
   "landed_cost.dialog.label_select_transaction_entry": "حدد سطر المعاملة ",
+  "landed_cost.dialog.label_unallocated_cost_amount":"قيمة التكلفة غير المحملة:",
+  "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line":"إجمالي قيمة التكلفة المحملة أكبر من قيمة سطر المعاملة.",
+  "landed_cost.once_your_delete_this_located_landed_cost": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟",
   "refund_credit_note.dialog.label": "استرجاع اموال",
   "refund_credit_note.dialog.success_message": "تم انشاء معاملة استرجاع الاموال لإشعار الدائن بنجاح.",
   "refund_credit_note.dialog.refund_date": "تاريخ الاسترجاع",
@@ -1753,5 +1755,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

@@ -1145,7 +1145,6 @@
   "From transaction": "From transaction",
   "landed": "Landed",
   "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.",
-  "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?",
   "journal_entries": "Journal Entries",
   "contact": "Contact",
   "invoice_details": "Invoice details",
@@ -1288,11 +1287,11 @@
   "inventory_adjustment.details_drawer.title": "Inventory adjustment details",
   "setup.organization.location": "Location",
   "preferences.general.success_message": "The general preferences has been saved.",
-  "customer.drawer.action.new_invoice": "New invoice",
+  "customer.drawer.action.new_invoice": "New Invoice",
-  "customer.drawer.action.new_estimate": "New estimate",
+  "customer.drawer.action.new_estimate": "New Estimate",
-  "customer.drawer.action.new_payment": "New payment",
+  "customer.drawer.action.new_payment": "New Payment",
-  "customer.drawer.action.new_receipt": "New receipt",
+  "customer.drawer.action.new_receipt": "New Receipt",
-  "customer.drawer.action.new_transaction": "New transaction",
+  "customer.drawer.action.new_transaction": "New Transaction",
   "customer.drawer.action.edit": "Edit",
   "customer.drawer.label.outstanding_receivable": "Outstanding receivable",
   "customer.drawer.label.customer_name": "Customer name",
@@ -1318,9 +1317,9 @@
   "vendor.drawer.label.note": "Note",
   "vendor.drawer.action.edit_vendor": "Edit vendor",
   "vendor.drawer.action.delete": "Delete",
-  "vendor.drawer.action.new_transaction": "New transaction",
+  "vendor.drawer.action.new_transaction": "New Transaction",
-  "vendor.drawer.action.new_payment": "New payment",
+  "vendor.drawer.action.new_payment": "New Payment",
-  "vendor.drawer.action.new_invoice": "New purchase invoice",
+  "vendor.drawer.action.new_invoice": "New Purchase Invoice",
   "vendor.drawer.action.edit": "Edit",
   "manual_journals.empty_status.description": "Manual journals can be used to record financial transactions manually, used by accountants to work with the ledger.",
   "manual_journals.empty_status.title": "Create your first journal entries on accounts chart.",
@@ -1568,6 +1567,9 @@
   "refund": "Refund",
   "landed_cost.dialog.label_select_transaction": "Select transaction",
   "landed_cost.dialog.label_select_transaction_entry": "Select transaction entry",
+  "landed_cost.dialog.label_unallocated_cost_amount": "Unallocated cost Amount:",
+  "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line": "The total located cost is bigger than the transaction line.",
+  "landed_cost.once_your_delete_this_located_landed_cost": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?",
   "refund_credit_note.dialog.label": "Refund Credit Note",
   "refund_credit_note.dialog.success_message": "The customer credit note refund has been created successfully.",
   "refund_credit_note.dialog.refund_date": "Refund date",
@@ -1733,5 +1735,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."
 }