Merge branch 'master' of https://github.com/abouolia/Ratteb

client/src/containers/Accounting/MakeJournalEntriesForm.js

@@ -189,8 +189,8 @@ function MakeJournalEntriesForm({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_journal_has_been_successfully_created'
+              ? 'the_journal_has_been_created_successfully'
-              : 'the_journal_has_been_successfully_edited',
+              : 'the_journal_has_been_edited_successfully',
           },
           { number: values.journal_number },
         ),

client/src/containers/Accounting/ManualJournalsList.js

@@ -95,7 +95,7 @@ function ManualJournalsTable({
     requestDeleteManualJournal(deleteManualJournal.id).then(() => {
       AppToaster.show({
         message: formatMessage(
-          { id: 'the_journal_has_been_successfully_deleted' },
+          { id: 'the_journal_has_been_deleted_successfully' },
           { number: deleteManualJournal.journal_number },
         ),
         intent: Intent.SUCCESS,
@@ -123,7 +123,7 @@ function ManualJournalsTable({
         setBulkDelete(false);
         AppToaster.show({
           message: formatMessage(
-            { id: 'the_journals_has_been_successfully_deleted' },
+            { id: 'the_journals_has_been_deleted_successfully' },
             { count: selectedRowsCount },
           ),
           intent: Intent.SUCCESS,

client/src/containers/Customers/CustomerForm.js

@@ -178,8 +178,8 @@ function CustomerForm({
       AppToaster.show({
         message: formatMessage({
           id: customer
-            ? 'the_item_customer_has_been_successfully_edited'
+            ? 'the_item_customer_has_been_edited_successfully'
-            : 'the_customer_has_been_successfully_created',
+            : 'the_customer_has_been_created_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/Customers/CustomersList.js

@@ -108,7 +108,7 @@ function CustomersList({
         setDeleteCustomer(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_customer_has_been_successfully_deleted',
+            id: 'the_customer_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -172,7 +172,7 @@ function CustomersList({
         setBulkDelete(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_customers_has_been_successfully_deleted',
+            id: 'the_customers_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Dialogs/AccountFormDialog/AccountFormDialogContent.js

@@ -81,8 +81,8 @@ function AccountFormDialogContent({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'service_has_been_successful_created'
+              ? 'service_has_been_created_successfully'
-              : 'service_has_been_successful_edited',
+              : 'service_has_been_edited_successfully',
           },
           {
             name: toastAccountName,

client/src/containers/Dialogs/CurrencyFormDialog/CurencyFormDialogContent.js

@@ -85,7 +85,7 @@ function CurencyFormDialogContent({
             closeDialog(dialogName);
             AppToaster.show({
               message: formatMessage({
-                id: 'the_currency_has_been_successfully_edited',
+                id: 'the_currency_has_been_edited_successfully',
               }),
               intent: Intent.SUCCESS,
             });
@@ -101,7 +101,7 @@ function CurencyFormDialogContent({
             closeDialog(dialogName);
             AppToaster.show({
               message: formatMessage({
-                id: 'the_currency_has_been_successfully_created',
+                id: 'the_currency_has_been_created_successfully',
               }),
               intent: Intent.SUCCESS,
             });

client/src/containers/Dialogs/ExchangeRateFormDialog/ExchangeRateFormDialogContent.js

@@ -112,7 +112,7 @@ function ExchangeRateFormDialogContent({
             closeDialog(dialogName);
             AppToaster.show({
               message: formatMessage({
-                id: 'the_exchange_rate_has_been_successfully_edited',
+                id: 'the_exchange_rate_has_been_edited_successfully',
               }),
               intent: Intent.SUCCESS,
             });
@@ -128,7 +128,7 @@ function ExchangeRateFormDialogContent({
             closeDialog(dialogName);
             AppToaster.show({
               message: formatMessage({
-                id: 'the_exchange_rate_has_been_successfully_created',
+                id: 'the_exchange_rate_has_been_created_successfully',
               }),
               intent: Intent.SUCCESS,
             });

client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogContent.js

@@ -89,7 +89,7 @@ function InventoryAdjustmentFormDialogContent({
 
       AppToaster.show({
         message: formatMessage({
-          id: 'the_make_adjustment_has_been_successfully_created',
+          id: 'the_make_adjustment_has_been_created_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormDialogContent.js

@@ -103,8 +103,8 @@ function ItemCategoryFormDialogContent({
       AppToaster.show({
         message: formatMessage({
           id: isNewMode
-            ? 'the_item_category_has_been_successfully_created'
+            ? 'the_item_category_has_been_created_successfully'
-            : 'the_item_category_has_been_successfully_edited',
+            : 'the_item_category_has_been_edited_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/ExchangeRates/ExchangeRatesList.js

@@ -75,7 +75,7 @@ function ExchangeRatesList({
         setDeleteExchangeRate(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_exchange_rates_has_been_successfully_deleted',
+            id: 'the_exchange_rates_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Expenses/ExpenseForm.js

@@ -152,8 +152,8 @@ function ExpenseForm({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_expense_has_been_successfully_created'
+              ? 'the_expense_has_been_created_successfully'
-              : 'the_expense_has_been_successfully_edited',
+              : 'the_expense_has_been_edited_successfully',
           },
           { number: values.payment_account_id },
         ),

client/src/containers/Expenses/ExpensesList.js

@@ -83,7 +83,7 @@ function ExpensesList({
     requestDeleteExpense(deleteExpense.id).then(() => {
       AppToaster.show({
         message: formatMessage(
-          { id: 'the_expense_has_been_successfully_deleted' },
+          { id: 'the_expense_has_been_deleted_successfully' },
           { number: deleteExpense.payment_account_id },
         ),
         intent: Intent.SUCCESS,
@@ -110,7 +110,7 @@ function ExpensesList({
       .then(() => {
         AppToaster.show({
           message: formatMessage(
-            { id: 'the_expenses_have_been_successfully_deleted' },
+            { id: 'the_expenses_have_been_deleted_successfully' },
             { count: selectedRowsCount },
           ),
           intent: Intent.SUCCESS,

client/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.js

@@ -31,6 +31,7 @@ function ReceivableAgingSummarySheet({
   // #withDashboardActions
   changePageTitle,
   setDashboardBackLink,
+  setSidebarShrink,
 
   // #withARAgingSummaryActions
   requestReceivableAgingSummary,
@@ -59,6 +60,7 @@ function ReceivableAgingSummarySheet({
   }, [ARAgingSummaryRefresh, refreshARAgingSummary]);
 
   useEffect(() => {
+    setSidebarShrink()
     // Show the back link on dashboard topbar.
     setDashboardBackLink(true);
 
@@ -66,7 +68,7 @@ function ReceivableAgingSummarySheet({
       // Hide the back link on dashboard topbar.
       setDashboardBackLink(false);
     };
-  }, [setDashboardBackLink]);
+  }, [setDashboardBackLink,setSidebarShrink]);
 
   // Handle fetching receivable aging summary report.
   const fetchARAgingSummarySheet = useQuery(

client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js

@@ -30,6 +30,7 @@ function BalanceSheet({
   // #withDashboardActions
   changePageTitle,
   setDashboardBackLink,
+  setSidebarShrink,
 
   // #withBalanceSheetActions
   fetchBalanceSheet,
@@ -58,8 +59,9 @@ function BalanceSheet({
   );
 
   useEffect(() => {
+    setSidebarShrink();
     changePageTitle(formatMessage({ id: 'balance_sheet' }));
-  }, [changePageTitle, formatMessage]);
+  }, [changePageTitle, formatMessage, setSidebarShrink]);
 
   // Observes the balance sheet refresh to invalid the query to refresh it.
   useEffect(() => {

client/src/containers/FinancialStatements/Journal/Journal.js

@@ -32,6 +32,7 @@ function Journal({
   // #withDashboardActions
   changePageTitle,
   setDashboardBackLink,
+  setSidebarShrink,
 
   // #withPreferences
   organizationName,
@@ -54,6 +55,7 @@ function Journal({
   }, [changePageTitle, formatMessage]);
 
   useEffect(() => {
+    setSidebarShrink();
     // Show the back link on dashboard topbar.
     setDashboardBackLink(true);
 
@@ -61,7 +63,7 @@ function Journal({
       // Hide the back link on dashboard topbar.
       setDashboardBackLink(false);
     };
-  });
+  }, [setDashboardBackLink, setSidebarShrink]);
 
   useEffect(() => {
     if (journalSheetRefresh) {

client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js

@@ -28,7 +28,8 @@ function ProfitLossSheet({
   // #withDashboardActions
   changePageTitle,
   setDashboardBackLink,
-
+  setSidebarShrink,
+  
   // #withProfitLoss
   profitLossSheetRefresh,
 
@@ -62,6 +63,7 @@ function ProfitLossSheet({
   }, [profitLossSheetRefresh, refreshProfitLossSheet]);
 
   useEffect(() => {
+    setSidebarShrink()
     // Show the back link on dashboard topbar.
     setDashboardBackLink(true);
 
@@ -69,7 +71,7 @@ function ProfitLossSheet({
       // Hide the back link on dashboard topbar.
       setDashboardBackLink(false);
     };
-  });
+  },[setDashboardBackLink,setSidebarShrink]);
 
   // Fetches profit/loss sheet.
   const fetchSheetHook = useQuery(['profit-loss-sheet', filter],

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

@@ -27,6 +27,7 @@ function TrialBalanceSheet({
   // #withDashboardActions
   changePageTitle,
   setDashboardBackLink,
+  setSidebarShrink,
 
   // #withTrialBalance
   trialBalanceSheetRefresh,
@@ -62,6 +63,7 @@ function TrialBalanceSheet({
   }, [changePageTitle, formatMessage]);
 
   useEffect(() => {
+    setSidebarShrink();
     // Show the back link on dashboard topbar.
     setDashboardBackLink(true);
 
@@ -69,7 +71,7 @@ function TrialBalanceSheet({
       // Hide the back link on dashboard topbar.
       setDashboardBackLink(false);
     };
-  });
+  }, [setDashboardBackLink, setSidebarShrink]);
 
   const handleFilterSubmit = useCallback(
     (filter) => {

client/src/containers/Items/InventoryAdjustmentList.js

@@ -69,7 +69,7 @@ function InventoryAdjustmentList({
         setDeleteInventoryAdjustment(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_adjustment_has_been_successfully_deleted',
+            id: 'the_adjustment_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Items/ItemsList.js

@@ -131,7 +131,7 @@ function ItemsList({
       .then(() => {
         AppToaster.show({
           message: formatMessage({
-            id: 'the_item_has_been_successfully_deleted',
+            id: 'the_item_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -187,7 +187,7 @@ function ItemsList({
         setBulkDelete(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_items_has_been_successfully_deleted',
+            id: 'the_items_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -219,7 +219,7 @@ function ItemsList({
         setInactiveItem(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_item_has_been_successfully_inactivated',
+            id: 'the_item_has_been_inactivated_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -247,7 +247,7 @@ function ItemsList({
         setActivateItem(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_item_has_been_successfully_activated',
+            id: 'the_item_has_been_activated_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Preferences/Currencies/CurrenciesList.js

@@ -57,7 +57,7 @@ function CurrenciesList({
           setDeleteCurrencyState(false);
           AppToaster.show({
             message: formatMessage({
-              id: 'the_currency_has_been_successfully_deleted',
+              id: 'the_currency_has_been_deleted_successfully',
             }),
             intent: Intent.SUCCESS,
           });

client/src/containers/Preferences/General/General.js

@@ -57,7 +57,7 @@ function GeneralPreferences({
       .then((response) => {
         AppToaster.show({
           message: formatMessage({
-            id: 'the_options_has_been_successfully_created',
+            id: 'the_options_has_been_created_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Preferences/Users/UsersList.js

@@ -53,7 +53,7 @@ function UsersListPreferences({
         setInactiveUserState(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_user_has_been_successfully_inactivated',
+            id: 'the_user_has_been_inactivated_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -86,7 +86,7 @@ function UsersListPreferences({
         setDeleteUserState(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_user_has_been_successfully_deleted',
+            id: 'the_user_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Purchases/Bill/BillForm.js

@@ -151,8 +151,8 @@ function BillForm({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_bill_has_been_successfully_created' :
+              ? 'the_bill_has_been_created_successfully' :
-              'the_bill_has_been_successfully_edited',
+              'the_bill_has_been_edited_successfully',
           },
           { number: values.bill_number },
         ),

client/src/containers/Purchases/Bill/BillsList.js

@@ -83,7 +83,7 @@ function BillsList({
     requestDeleteBill(deleteBill.id).then(() => {
       AppToaster.show({
         message: formatMessage({
-          id: 'the_bill_has_been_successfully_deleted',
+          id: 'the_bill_has_been_deleted_successfully',
         }),
         intent: Intent.SUCCESS,
       });
@@ -108,7 +108,7 @@ function BillsList({
         setOpenBill(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_bill_has_been_successfully_opened',
+            id: 'the_bill_has_been_opened_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js

@@ -150,8 +150,8 @@ function PaymentMadeForm({
       AppToaster.show({
         message: formatMessage({
           id: paymentMadeId
-            ? 'the_payment_made_has_been_successfully_edited'
+            ? 'the_payment_made_has_been_edited_successfully'
-            : 'the_payment_made_has_been_successfully_created',
+            : 'the_payment_made_has_been_created_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/Purchases/PaymentMades/PaymentMadeList.js

@@ -78,7 +78,7 @@ function PaymentMadeList({
     requestDeletePaymentMade(deletePaymentMade.id).then(() => {
       AppToaster.show({
         message: formatMessage({
-          id: 'the_payment_made_has_been_successfully_deleted',
+          id: 'the_payment_made_has_been_deleted_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/Sales/Estimate/EstimateForm.js

@@ -195,8 +195,8 @@ const EstimateForm = ({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_estimate_has_been_successfully_edited'
+              ? 'the_estimate_has_been_edited_successfully'
-              : 'the_estimate_has_been_successfully_created',
+              : 'the_estimate_has_been_created_successfully',
           },
           { number: values.estimate_number },
         ),

client/src/containers/Sales/Estimate/EstimatesList.js

@@ -86,7 +86,7 @@ function EstimatesList({
     requestDeleteEstimate(deleteEstimate.id).then(() => {
       AppToaster.show({
         message: formatMessage({
-          id: 'the_estimate_has_been_successfully_deleted',
+          id: 'the_estimate_has_been_deleted_successfully',
         }),
         intent: Intent.SUCCESS,
       });
@@ -111,7 +111,7 @@ function EstimatesList({
         setDeliverEstimate(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_estimate_has_been_successfully_delivered',
+            id: 'the_estimate_has_been_delivered_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -139,7 +139,7 @@ function EstimatesList({
         setApproveEstimate(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_estimate_has_been_successfully_approved',
+            id: 'the_estimate_has_been_approved_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -167,7 +167,7 @@ function EstimatesList({
         setRejectEstimate(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_estimate_has_been_successfully_rejected',
+            id: 'the_estimate_has_been_rejected_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Sales/Invoice/InvoiceForm.js

@@ -179,8 +179,8 @@ function InvoiceForm({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_invocie_has_been_successfully_created'
+              ? 'the_invoice_has_been_created_successfully'
-              : 'the_invoice_has_been_successfully_edited',
+              : 'the_invoice_has_been_edited_successfully',
           },
           { number: values.invoice_no },
         ),

client/src/containers/Sales/Invoice/InvoicesList.js

@@ -100,7 +100,7 @@ function InvoicesList({
         setDeleteInvoice(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_invoice_has_been_successfully_deleted',
+            id: 'the_invoice_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });
@@ -128,7 +128,7 @@ function InvoicesList({
         setDeliverInvoice(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_invoice_has_been_successfully_delivered',
+            id: 'the_invoice_has_been_delivered_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Sales/PaymentReceive/PaymentReceivesList.js

@@ -78,7 +78,7 @@ function PaymentReceiveList({
     requestDeletePaymentReceive(deletePaymentReceive.id).then(() => {
       AppToaster.show({
         message: formatMessage({
-          id: 'the_payment_receive_has_been_successfully_deleted',
+          id: 'the_payment_receive_has_been_deleted_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/Sales/Receipt/ReceiptForm.js

@@ -194,8 +194,8 @@ function ReceiptForm({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_receipt_has_been_successfully_created'
+              ? 'the_receipt_has_been_created_successfully'
-              : 'the_receipt_has_been_successfully_edited',
+              : 'the_receipt_has_been_edited_successfully',
           },
           { number: values.receipt_number },
         ),

client/src/containers/Sales/Receipt/ReceiptsList.js

@@ -75,7 +75,7 @@ function ReceiptsList({
     requestDeleteReceipt(deleteReceipt.id).then(() => {
       AppToaster.show({
         message: formatMessage({
-          id: 'the_receipt_has_been_successfully_deleted',
+          id: 'the_receipt_has_been_deleted_successfully',
         }),
         intent: Intent.SUCCESS,
       });
@@ -100,7 +100,7 @@ function ReceiptsList({
         setCloseReceipt(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_receipt_has_been_successfully_closed',
+            id: 'the_receipt_has_been_closed_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Vendors/VendorForm.js

@@ -114,8 +114,8 @@ function VendorForm({
       AppToaster.show({
         message: formatMessage({
           id: isNewMode
-            ? 'the_vendor_has_been_successfully_created'
+            ? 'the_vendor_has_been_created_successfully'
-            : 'the_item_vendor_has_been_successfully_edited',
+            : 'the_item_vendor_has_been_edited_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/containers/Vendors/VendorsList.js

@@ -100,7 +100,7 @@ function VendorsList({
         setDeleteVendor(false);
         AppToaster.show({
           message: formatMessage({
-            id: 'the_vendor_has_been_successfully_deleted',
+            id: 'the_vendor_has_been_deleted_successfully',
           }),
           intent: Intent.SUCCESS,
         });

client/src/containers/Views/ViewFormPage.js

@@ -77,7 +77,7 @@ function ViewFormPage({
       setStateDeleteView(null);
       AppToaster.show({
         message: formatMessage({
-          id: 'the_custom_view_has_been_successfully_deleted',
+          id: 'the_custom_view_has_been_deleted_successfully',
         }),
         intent: Intent.SUCCESS,
       });

client/src/lang/en/index.js

@@ -172,10 +172,10 @@ export default {
   new_custom_view: 'New Custom View',
   view_name: 'View Name',
   item: 'Item',
-  service_has_been_successful_created:
+  service_has_been_created_successfully:
-    '{service} {name} has been successfully created.',
+    '{service} {name} has been created successfully.',
-  service_has_been_successful_edited:
+  service_has_been_edited_successfully:
-    '{service} {name} has been successfully edited.',
+    '{service} {name} has been edited successfully.',
   you_are_about_permanently_delete_this_journal: `You're about to permanently delete this journal and all its transactions on accounts and attachments, and all of its data. <br /><br />If you're not sure, you can archive this journal instead.`,
   once_delete_these_accounts_you_will_not_able_restore_them:
     "Once you delete these accounts, you won't be able to retrieve them later. Are you sure you want to delete them?",
@@ -202,38 +202,38 @@ export default {
   are_sure_to_activate_this_accounts:
     'Are you sure you want to activate this accounts? You will be able to inactivate it later',
   once_delete_this_account_you_will_able_to_restore_it: `Once you delete this account, you won\'t be able to restore it later. Are you sure you want to delete this account?<br /><br />If you're not sure, you can inactivate this account instead.`,
-  the_journal_has_been_successfully_created:
+  the_journal_has_been_created_successfully:
-    'The journal #{number} has been successfully created.',
+    'The journal #{number} has been created successfully.',
-  the_journal_has_been_successfully_edited:
+  the_journal_has_been_edited_successfully:
-    'The journal #{number} has been successfully edited.',
+    'The journal #{number} has been edited successfully.',
-  the_journal_has_been_successfully_deleted:
+  the_journal_has_been_deleted_successfully:
-    'The journal has been successfully deleted',
+    'The journal has been deleted successfully',
   the_manual_journal_has_been_published:
     'The manual journal has been published',
-  the_journals_has_been_successfully_deleted:
+  the_journals_has_been_deleted_successfully:
-    'The journals has been successfully deleted ',
+    'The journals has been deleted successfully ',
   credit: 'Credit',
   debit: 'Debit',
   once_delete_this_item_you_will_able_to_restore_it: `Once you delete this item, you won\'t be able to restore the item later. Are you sure you want to delete ?<br /><br />If you're not sure, you can inactivate it instead.`,
-  the_item_has_been_successfully_deleted:
+  the_item_has_been_deleted_successfully:
-    'The item has been successfully deleted.',
+    'The item has been deleted successfully.',
   the_item_has_been_created_successfully:
     'The item has been created successfully.',
-  the_item_has_been_successfully_edited:
+  the_item_has_been_edited_successfully:
-    'The item #{number} has been successfully edited.',
+    'The item #{number} has been edited successfully',
 
-  the_item_category_has_been_successfully_created:
+  the_item_category_has_been_created_successfully:
-    'The item category has been successfully created.',
+    'The item category has been created successfully.',
-  the_item_category_has_been_successfully_edited:
+  the_item_category_has_been_edited_successfully:
-    'The item category has been successfully edited.',
+    'The item category has been edited successfully.',
   the_item_category_has_been_deleted_successfully:
     'The item category has been deleted successfully.',
   once_delete_these_item_categories_you_will_not_able_restore_them:
     "Once you delete these categories, you won't be able to retrieve them later. Are you sure you want to delete them?",
   once_delete_these_views_you_will_not_able_restore_them:
     "Once you delete the custom view, you won't be able to restore it later. Are you sure you want to delete this view?",
-  the_custom_view_has_been_successfully_deleted:
+  the_custom_view_has_been_deleted_successfully:
-    'The custom view has been successfully deleted.',
+    'The custom view has been deleted successfully.',
   teammate_invited_to_organization_account:
     'Your teammate has been invited to the organization account.',
   select_account_type: 'Select account type',
@@ -295,16 +295,12 @@ export default {
   we_couldn_t_find_your_account_with_that_email:
     "We couldn't find your account with that email.",
   select_parent_account: 'Select Parent Account',
-  the_exchange_rate_has_been_successfully_edited:
+  the_exchange_rate_has_been_edited_successfully:
-    'The exchange rate has been successfully edited',
+    'The exchange rate has been edited successfully',
-  the_exchange_rate_has_been_successfully_created:
+  the_exchange_rate_has_been_created_successfully:
-    'The exchange rate has been successfully created',
+    'The exchange rate has been created successfully',
   the_user_details_has_been_updated: 'The user details has been updated',
-  the_category_has_been_successfully_created:
-    'The category has been successfully created.',
   filters_applied: 'filters applied',
-  the_expense_has_been_successfully_deleted:
-    'The expense has been successfully deleted.',
   select_item_type: 'Select Item Type',
   service: 'Service',
   inventory: 'Inventory',
@@ -312,8 +308,6 @@ export default {
   select_category: 'Select category',
   select_account: 'Select Account',
   custom_fields: 'Custom Fields',
-  the_currency_has_been_successfully_deleted:
-    'The currency has been successfully deleted',
   organization_industry: 'Organization Industry',
   business_location: 'Business Location',
   base_currency: 'Base Currency',
@@ -326,10 +320,10 @@ export default {
   inactivate_user: 'Inactivate User',
   delete_user: 'Delete User',
   full_name: 'Full Name',
-  the_user_has_been_successfully_inactivated:
+  the_user_has_been_inactivated_successfully:
-    'The user has been successfully inactivated.',
+    'The user has been inactivated successfully.',
-  the_user_has_been_successfully_deleted:
+    the_user_has_been_deleted_successfully:
-    'The user has been successfully deleted.',
+    'The user has been deleted successfully.',
   customize_report: 'Customize Report',
   print: 'Print',
   export: 'Export',
@@ -348,12 +342,12 @@ export default {
   display_report_columns: 'Display report columns',
   select_display_columns_by: 'Select display columns by...',
   credit_and_debit_not_equal: 'credit and debit not equal',
-  the_currency_has_been_successfully_edited:
+  the_currency_has_been_edited_successfully:
-    'The currency has been successfully edited',
+    'The currency has been edited successfully',
-  the_currency_has_been_successfully_created:
+  the_currency_has_been_created_successfully:
-    'The currency has been successfully created',
+    'The currency has been created successfully',
-  the_currency_has_been_successfully_deleted:
+  the_currency_has_been_deleted_successfully:
-    'The currency has been successfully deleted',
+    'The currency has been deleted successfully',
   once_delete_this_currency_you_will_able_to_restore_it: `Once you delete this currency, you won\'t be able to restore it later. Are you sure you want to delete this currency?`,
   once_delete_this_exchange_rate_you_will_able_to_restore_it: `Once you delete this exchange rate, you won\'t be able to restore it later. Are you sure you want to delete this exchange rate?`,
   once_delete_these_exchange_rates_you_will_not_able_restore_them: `Once you delete these exchange rates, you won't be able to retrieve them later. Are you sure you want to delete them?`,
@@ -366,12 +360,12 @@ export default {
   select_time_zone: 'Select Time Zone',
   select_currency: 'Select Currency',
   select_parent_category: 'Select Parent Category',
-  the_options_has_been_successfully_created:
+  the_options_has_been_created_successfully:
-    'The options has been successfully created',
+    'The options has been created successfully',
   there_is_exchange_rate_in_this_date_with_the_same_currency:
     'There is exchange rate in this date with the same currency.',
-  the_exchange_rates_has_been_successfully_deleted:
+  the_exchange_rates_has_been_deleted_successfully:
-    'The exchange rates has been successfully deleted',
+    'The exchange rates has been deleted successfully',
   once_delete_this_expense_you_will_able_to_restore_it: `Once you delete this expense, you won\'t be able to restore it later. Are you sure you want to delete this expense?`,
   january: 'January',
   february: 'February',
@@ -415,8 +409,8 @@ export default {
   view_name_: 'View name',
   time_zone_: 'Time zone',
   location: 'Location',
-  the_items_has_been_successfully_deleted:
+  the_items_has_been_deleted_successfully:
-    'The items have been successfully deleted.',
+    'The items have been deleted successfully.',
   once_delete_these_items_you_will_not_able_restore_them:
     "Once you delete these items, you won't be able to retrieve them later. Are you sure you want to delete them?",
   ops_something_went_wrong: 'Something went wrong! Please try again.',
@@ -449,14 +443,14 @@ export default {
   new_expense: 'New Expense',
   full_amount: 'Full Amount',
   payment_date_: 'Payment date',
-  the_expense_has_been_successfully_created:
+  the_expense_has_been_created_successfully:
-    'The expense #{number} has been successfully created.',
+    'The expense #{number} has been created successfully.',
-  the_expense_has_been_successfully_edited:
+  the_expense_has_been_edited_successfully:
-    'The expense #{number} has been successfully edited.',
+    'The expense #{number} has been edited successfully.',
-  the_expense_has_been_successfully_deleted:
+  the_expense_has_been_deleted_successfully:
-    'The expense has been successfully deleted',
+    'The expense has been deleted successfully',
-  the_expenses_have_been_successfully_deleted:
+  the_expenses_have_been_deleted_successfully:
-    'The expenses have been successfully deleted',
+    'The expenses have been deleted successfully',
   once_delete_these_expenses_you_will_not_able_restore_them:
     "Once you delete these expenses, you won't be able to retrieve them later. Are you sure you want to delete them?",
   the_expense_has_been_published: 'The expense has been published',
@@ -481,8 +475,8 @@ export default {
   business: 'Business',
   individual: 'Individual',
   display_name: 'Display Name',
-  the_customer_has_been_successfully_created:
+  the_customer_has_been_created_successfully:
-    'The customer has been successfully created.',
+    'The customer has been created successfully.',
   select_contact: 'Select contact',
   contact: 'Contact',
   contacts: 'Contacts',
@@ -514,14 +508,12 @@ export default {
   shipping_address: 'Shipping Address',
   customers_list: 'Customers List',
   receivable_balance: 'Receivable balance',
-  the_customer_has_been_successfully_created:
+  the_customer_has_been_deleted_successfully:
-    'The customer has been successfully created.',
+    'The customer has been deleted successfully.',
-  the_customer_has_been_successfully_deleted:
+  the_customers_has_been_deleted_successfully:
-    'The customer has been successfully deleted.',
+    'The customers have been deleted successfully.',
-  the_customers_has_been_successfully_deleted:
+  the_item_customer_has_been_edited_successfully:
-    'The customers have been successfully deleted.',
+    'The item customer has been edited successfully.',
-  the_item_customer_has_been_successfully_edited:
-    'The item customer has been successfully edited.',
   once_delete_this_customer_you_will_able_to_restore_it: `Once you delete this customer, you won\'t be able to restore it later. Are you sure you want to delete this cusomter?`,
   once_delete_these_customers_you_will_not_able_restore_them:
     "Once you delete these customers, you won't be able to retrieve them later. Are you sure you want to delete them?",
@@ -604,12 +596,12 @@ export default {
   estimates_list: 'Estimates List',
   estimate_number: 'Estimate Number',
   product_and_service: 'Product/Service',
-  the_estimate_has_been_successfully_edited:
+  the_estimate_has_been_edited_successfully:
-    'The estimate #{number} has been successfully edited.',
+    'The estimate #{number} has been edited successfully.',
-  the_estimate_has_been_successfully_created:
+  the_estimate_has_been_created_successfully:
-    'The estimate #{number} has been successfully created.',
+    'The estimate #{number} has been created successfully.',
-  the_estimate_has_been_successfully_deleted:
+  the_estimate_has_been_deleted_successfully:
-    'The estimate has been successfully deleted.',
+    'The estimate has been deleted successfully.',
   once_delete_this_estimate_you_will_able_to_restore_it: `Once you delete this estimate, you won\'t be able to restore it later. Are you sure you want to delete this estimate?`,
   cannot_be_zero_or_empty: 'cannot be zero or empty.',
   invoices: 'Invoices',
@@ -631,12 +623,12 @@ export default {
   delete_invoice: 'Delete Invoice',
   new_invoice: 'New Invoice',
   invoice_list: 'Invoice List',
-  the_invoice_has_been_successfully_edited:
+  the_invoice_has_been_edited_successfully:
-    'The invoice #{number} has been successfully edited.',
+    'The invoice #{number} has been edited successfully.',
-  the_invocie_has_been_successfully_created:
+  the_invoice_has_been_created_successfully:
-    'The invoice #{number} has been successfully created.',
+    'The invoice #{number} has been created successfully.',
-  the_invoice_has_been_successfully_deleted:
+  the_invoice_has_been_deleted_successfully:
-    'The invoice has been successfully deleted.',
+    'The invoice has been deleted successfully.',
   once_delete_this_invoice_you_will_able_to_restore_it: `Once you delete this invoice, you won\'t be able to restore it later. Are you sure you want to delete this invoice?`,
   receipts_list: 'Receipts List',
   receipts: 'Receipts',
@@ -655,12 +647,12 @@ export default {
   send_to_email: 'Send to email',
   select_deposit_account: 'Select Deposit Account',
   once_delete_this_receipt_you_will_able_to_restore_it: `Once you delete this receipt, you won\'t be able to restore it later. Are you sure you want to delete this receipt?`,
-  the_receipt_has_been_successfully_created:
+  the_receipt_has_been_created_successfully:
-    'The recepit #{number} has been successfully created.',
+    'The receipt #{number} has been created successfully.',
-  the_receipt_has_been_successfully_edited:
+  the_receipt_has_been_edited_successfully:
-    'The receipt #{number}  has been successfully edited.',
+    'The receipt #{number}  has been edited successfully.',
-  the_receipt_has_been_successfully_deleted:
+  the_receipt_has_been_deleted_successfully:
-    'The receipt has been successfully deleted.',
+    'The receipt has been deleted successfully.',
   bills_list: 'Bills List',
   bills: 'Bills',
   accept: 'Accept',
@@ -676,12 +668,12 @@ export default {
   bill_number_: 'Bill number',
   vendor_name_: 'Vendor name',
   delete_bill: 'Delete Bill',
-  the_bill_has_been_successfully_edited:
+  the_bill_has_been_edited_successfully:
-    'The bill #{number} has been successfully edited.',
+    'The bill #{number} has been edited successfully.',
-  the_bill_has_been_successfully_created:
+  the_bill_has_been_created_successfully:
-    'The bill #{number} has been successfully created.',
+    'The bill #{number} has been created successfully.',
-  the_bill_has_been_successfully_deleted:
+  the_bill_has_been_deleted_successfully:
-    'The bill has been successfully deleted.',
+    'The bill has been deleted successfully.',
   once_delete_this_bill_you_will_able_to_restore_it: `Once you delete this bill, you won\'t be able to restore it later. Are you sure you want to delete this bill?`,
   deposit_to: 'Deposit to',
   edit_payment_receive: 'Edit Payment Receive',
@@ -696,8 +688,8 @@ export default {
   receive_amount_: 'Receive amount',
   the_payment_receive_transaction_has_been_created:
     'The payment receive transaction has been created successfully.',
-  the_payment_receive_has_been_successfully_deleted:
+  the_payment_receive_has_been_deleted_successfully:
-    'The payment receive has been successfully deleted.',
+    'The payment receive has been deleted successfully.',
   the_payment_receive_transaction_has_been_edited:
     'The payment receive transaction has been edited successfully.',
   once_delete_this_payment_receive_you_will_able_to_restore_it: `Once you delete this payment receive, you won\'t be able to restore it later. Are you sure you want to delete this payment receive?`,
@@ -706,8 +698,8 @@ export default {
   subscription: 'Subscription',
   plan_slug: 'Plan slug',
   billing: 'Billing',
-  the_billing_has_been_successfully_created:
+  the_billing_has_been_created_successfully:
-    'The billing has been successfully created.',
+    'The billing has been created successfully.',
   a_select_a_plan: 'A. Select a plan',
   b_choose_your_billing: 'B. Choose your billing',
   c_payment_methods: 'C. Payment methods',
@@ -743,12 +735,12 @@ export default {
   payment_account: 'Payment Account',
   select_vender_account: 'Select Vender Account',
   select_payment_account: 'Select Payment Account',
-  the_payment_made_has_been_successfully_edited:
+  the_payment_made_has_been_edited_successfully:
-    'The payment made has been successfully edited.',
+    'The payment made has been edited successfully.',
-  the_payment_made_has_been_successfully_created:
+  the_payment_made_has_been_created_successfully:
-    'The payment made has been successfully created.',
+    'The payment made has been created successfully.',
-  the_payment_made_has_been_successfully_deleted:
+  the_payment_made_has_been_deleted_successfully:
-    'The payment made has been successfully deleted.',
+    'The payment made has been deleted successfully.',
   once_delete_this_payment_made_you_will_able_to_restore_it: `Once you delete this payment made, you won\'t be able to restore it later. Are you sure you want to delete this payment made?`,
   sellable: 'Sellable',
   purchasable: 'Purchasable',
@@ -834,20 +826,16 @@ export default {
   edit_vendor: 'Edit Vendor',
   delete_vendor: 'Delete Vendor',
   vendors_list: 'Vendors List',
-  the_vendor_has_been_successfully_created:
+  the_vendor_has_been_created_successfully:
     'The vendor has been successfully created.',
-  the_vendor_has_been_successfully_deleted:
+  the_vendor_has_been_deleted_successfully:
-    'The vendor has been successfully deleted.',
+    'The vendor has been deleted successfully.',
-  the_vendors_has_been_successfully_deleted:
+  the_item_vendor_has_been_edited_successfully:
-    'The vendors has been successfully deleted.',
+    'The item vendor has been edited successfully.',
-  the_item_vendor_has_been_successfully_edited:
-    'The item vendor has been successfully edited.',
   once_delete_this_vendor_you_will_able_to_restore_it: `Once you delete this vendor, you won\'t be able to restore it later. Are you sure you want to delete this vendor?`,
   once_delete_these_vendors_you_will_not_able_restore_them:
     "Once you delete these vendors, you won't be able to retrieve them later. Are you sure you want to delete them?",
   vendor_has_bills: 'Vendor has bills',
-  the_item_has_been_edited_successfully:
-    'The item has been edited successfully.',
   you_cannot_make_payment_with_zero_total_amount:
     'You cannot record payment transaction with zero total amount',
   are_sure_to_publish_this_manual_journal:
@@ -876,8 +864,8 @@ export default {
   paid: 'Paid',
   your_account_has_been_locked:
     'Your account has been locked due to repeated failed login attempts. Please wait a few minutes before trying again.',
-  the_invoice_has_been_successfully_delivered:
+  the_invoice_has_been_delivered_successfully:
-    'The invoice has been successfully delivered.',
+    'The invoice has been delivered successfully.',
   are_sure_to_deliver_this_invoice:
     'Are you sure you want to deliver this invoice?',
   mark_as_delivered: 'Mark as delivered',
@@ -888,24 +876,24 @@ export default {
   save_open: 'Save & Open',
   close_and_new: 'Close and new',
   close_continue_editing: 'Close (continue editing)',
-  the_receipt_has_been_successfully_closed:
+  the_receipt_has_been_closed_successfully:
-    'The receipt has been successfully closed.',
+    'The receipt has been closed successfully.',
   are_sure_to_close_this_receipt:
     'Are you sure you want to close this receipt?',
   closed: 'Closed',
   open_and_new: 'Open and new',
   open_continue_editing: 'Open (continue editing)',
-  the_bill_has_been_successfully_opened:
+  the_bill_has_been_opened_successfully:
-    'The bill has been successfully opened.',
+    'The bill has been opened successfully.',
   open: 'Open',
   are_sure_to_open_this_bill: 'Are you sure you want to open this bill?',
   opened: 'Opened',
-  the_estimate_has_been_successfully_delivered:
+  the_estimate_has_been_delivered_successfully:
-    'The estimate has been successfully delivered.',
+    'The estimate has been delivered successfully.',
-  the_estimate_has_been_successfully_approved:
+  the_estimate_has_been_approved_successfully:
-    'The estimate has been successfully approved.',
+    'The estimate has been approved successfully.',
-  the_estimate_has_been_successfully_rejected:
+  the_estimate_has_been_rejected_successfully:
-    'The estimate has been successfully rejected.',
+    'The estimate has been rejected successfully.',
   are_sure_to_deliver_this_estimate:
     'Are you sure you want to deliver this estimate?',
   approve: 'Approve',
@@ -919,10 +907,10 @@ export default {
   delivered: 'Delivered',
   rejected: 'Rejected',
   approved: 'Approved',
-  the_item_has_been_successfully_inactivated:
+  the_item_has_been_inactivated_successfully:
-    'The item has been successfully inactivated.',
+    'The item has been inactivated successfully.',
-  the_item_has_been_successfully_activated:
+  the_item_has_been_activated_successfully:
-    'The item has been successfully activated.',
+    'The item has been activated successfully.',
   are_sure_to_inactive_this_item:
     'Are you sure you want to inactive this item? You will be able to activate it later',
   are_sure_to_activate_this_item:
@@ -952,10 +940,10 @@ export default {
   adjustment_account: 'Adjustment account',
   inventory_adjustment_list: 'Inventory Adjustment List',
   delete_adjustment: 'Delete Adjustment',
-  the_make_adjustment_has_been_successfully_created:
+  the_make_adjustment_has_been_created_successfully:
-    'The make adjustment has been successfully created.',
+    'The make adjustment has been created successfully.',
-  the_adjustment_has_been_successfully_deleted:
+    the_adjustment_has_been_deleted_successfully:
-    'The adjustment has been successfully deleted.',
+    'The adjustment has been deleted successfully.',
   once_delete_this_inventory_a_adjustment_you_will_able_to_restore_it: `Once you delete this inventory a adjustment, you won\'t be able to restore it later. Are you sure you want to delete this invoice?`,
   select_adjustment_account: 'Select adjustment account',
   qty: 'Quantity on hand',
@@ -975,5 +963,5 @@ export default {
   all_customers: 'All Customers',
   selected_customers: '{count} Selected Customers',
   transaction_number: 'Transaction #',
-  running_balance: 'Running balance'
+  running_balance: 'Running balance',
 };