From 162ad91547a13070bfca94f2eac2826477968aad Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 11 Jun 2023 19:34:24 +0200 Subject: [PATCH] fix(webapp): handle make journal error when create journal with accounts have different currency --- .../src/containers/Accounting/MakeJournal/utils.tsx | 11 +++++++++++ packages/webapp/src/lang/en/index.json | 1 + 2 files changed, 12 insertions(+) diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/utils.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/utils.tsx index 8e42a6630..5259a554e 100644 --- a/packages/webapp/src/containers/Accounting/MakeJournal/utils.tsx +++ b/packages/webapp/src/containers/Accounting/MakeJournal/utils.tsx @@ -28,6 +28,8 @@ const ERROR = { CREDIT_DEBIT_SUMATION_SHOULD_NOT_EQUAL_ZERO: 'CREDIT.DEBIT.SUMATION.SHOULD.NOT.EQUAL.ZERO', ENTRIES_SHOULD_ASSIGN_WITH_CONTACT: 'ENTRIES_SHOULD_ASSIGN_WITH_CONTACT', + COULD_NOT_ASSIGN_DIFFERENT_CURRENCY_TO_ACCOUNTS: + 'COULD_NOT_ASSIGN_DIFFERENT_CURRENCY_TO_ACCOUNTS', }; export const MIN_LINES_NUMBER = 1; @@ -161,6 +163,15 @@ export const transformErrors = (resErrors, { setErrors, errors }) => { intl.get('journal_number_is_already_used'), ); } + if ( + (error = getError(ERROR.COULD_NOT_ASSIGN_DIFFERENT_CURRENCY_TO_ACCOUNTS)) + ) { + toastMessages.push( + intl.get( + 'make_journal.errors.should_add_accounts_in_same_currency_or_base_currency', + ), + ); + } setErrors({ ...newErrors }); if (toastMessages.length > 0) { diff --git a/packages/webapp/src/lang/en/index.json b/packages/webapp/src/lang/en/index.json index d9b5f02a8..88d354d06 100644 --- a/packages/webapp/src/lang/en/index.json +++ b/packages/webapp/src/lang/en/index.json @@ -703,6 +703,7 @@ "email_is_already_used": "The email is already used.", "the_item_categories_has_been_deleted_successfully": "The item categories has been deleted successfully .", "receivable_accounts_should_assign_with_customers": "Receivable accounts should assign with customers.", + "make_journal.errors.should_add_accounts_in_same_currency_or_base_currency": "You can only add accounts that have the same selected currency or base currency.", "delivered": "Delivered", "save_and_deliver": "Save & Deliver", "deliver_and_new": "Deliver and new",