diff --git a/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.js b/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.js
index 607093a9e..9a5185523 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.js
@@ -12,9 +12,7 @@ export function MakeJournalFormFooterLeft() {
>
}
/>
diff --git a/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.js b/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.js
index a992b8be0..7cb25f70f 100644
--- a/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.js
+++ b/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.js
@@ -52,7 +52,7 @@ function WarehouseTransferNumberDialogContent({
return;
}
// Transformes the form values to settings to save it.
- const options = transformFormToSettings(values, 'warehouse_transfer');
+ const options = transformFormToSettings(values, 'warehouse_transfers');
// Save the settings.
saveSettings({ options }).then(handleSuccess).catch(handleErrors);
diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.js b/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.js
index 224182474..b3566d1ab 100644
--- a/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.js
+++ b/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.js
@@ -12,9 +12,7 @@ export function ExpenseFormFooterLeft() {
>
}
/>
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
index bd872e7ca..ead5cc418 100644
--- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
@@ -13,7 +13,9 @@ export function PaymentMadeFormFooterLeft() {
>
+ }
/>
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/utils.js b/src/containers/Purchases/PaymentMades/PaymentForm/utils.js
index aed5a7f51..5db1b7561 100644
--- a/src/containers/Purchases/PaymentMades/PaymentForm/utils.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/utils.js
@@ -1,7 +1,7 @@
import React from 'react';
import moment from 'moment';
import intl from 'react-intl-universal';
-import { pick, first } from 'lodash';
+import { pick, first, sumBy } from 'lodash';
import { useFormikContext } from 'formik';
import { Intent } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -143,7 +143,10 @@ export const usePaymentMadeTotals = () => {
} = useFormikContext();
// Retrieves the invoice entries total.
- const total = React.useMemo(() => getEntriesTotal(entries), [entries]);
+ const total = React.useMemo(
+ () => sumBy(entries, 'payment_amount'),
+ [entries],
+ );
// Retrieves the formatted total money.
const formattedTotal = React.useMemo(
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
index ea7849202..093e4728b 100644
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
@@ -13,7 +13,9 @@ export function CreditNoteFormFooterLeft() {
>
+ }
/>
{/* --------- Terms and conditions --------- */}
@@ -23,9 +25,7 @@ export function CreditNoteFormFooterLeft() {
>
}
/>
diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.js b/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.js
index bc4a4e047..1160e8f80 100644
--- a/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.js
+++ b/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.js
@@ -13,7 +13,9 @@ export function EstimateFormFooterLeft() {
>
+ }
/>
@@ -24,9 +26,7 @@ export function EstimateFormFooterLeft() {
>
}
/>
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
index 02307a701..9220992b4 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
@@ -13,7 +13,9 @@ export function InvoiceFormFooterLeft() {
>
+ }
/>
@@ -24,9 +26,7 @@ export function InvoiceFormFooterLeft() {
>
}
/>
@@ -49,7 +49,6 @@ const InvoiceMsgFormGroup = styled(FFormGroup)`
const TermsConditsFormGroup = styled(FFormGroup)`
&.bp3-form-group {
-
.bp3-label {
font-size: 12px;
margin-bottom: 12px;
diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js
index 795e628a3..38aa84ef7 100644
--- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js
+++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js
@@ -13,7 +13,9 @@ export function PaymentReceiveFormFootetLeft() {
>
+ }
/>
@@ -31,4 +33,3 @@ const TermsConditsFormGroup = styled(FFormGroup)`
}
}
`;
-
diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
index e21d6cc12..65541e170 100644
--- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
+++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
@@ -1,7 +1,7 @@
import React from 'react';
import moment from 'moment';
import intl from 'react-intl-universal';
-import { omit, pick, first } from 'lodash';
+import { omit, pick, first, sumBy } from 'lodash';
import { useFormikContext } from 'formik';
import { Intent } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -226,7 +226,10 @@ export const usePaymentReceiveTotals = () => {
} = useFormikContext();
// Retrieves the invoice entries total.
- const total = React.useMemo(() => getEntriesTotal(entries), [entries]);
+ const total = React.useMemo(
+ () => sumBy(entries, 'payment_amount'),
+ [entries],
+ );
// Retrieves the formatted total money.
const formattedTotal = React.useMemo(
diff --git a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.js b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.js
index 38663439d..8821688b9 100644
--- a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.js
+++ b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.js
@@ -13,7 +13,9 @@ export function ReceiptFormFooterLeft() {
>
+ }
/>
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
index b886dca92..47bc4f0d7 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
@@ -66,7 +66,7 @@ function WarehouseTransfersActionsBar({
// Handle table row size change.
const handleTableRowSizeChange = (size) => {
- addSetting('warehouseTransfer', 'tableSize', size);
+ addSetting('warehouseTransfers', 'tableSize', size);
};
return (
diff --git a/src/hooks/query/warehouses.js b/src/hooks/query/warehouses.js
index ff6c66482..acea73d4a 100644
--- a/src/hooks/query/warehouses.js
+++ b/src/hooks/query/warehouses.js
@@ -12,7 +12,7 @@ const commonInvalidateQueries = (queryClient) => {
// Invalidate warehouses transfers.
queryClient.invalidateQueries(t.WAREHOUSE_TRANSFERS);
- queryClient.invalidateQueries(t.WAREHOUSE_TRANSFER);
+ // queryClient.invalidateQueries(t.WAREHOUSE_TRANSFER);
queryClient.invalidateQueries(t.DASHBOARD_META);
};
@@ -155,9 +155,6 @@ export function useDeleteWarehouseTransfer(props) {
return useMutation((id) => apiRequest.delete(`warehouses/transfers/${id}`), {
onSuccess: (res, id) => {
- // Invalidate specific warehoue.
- queryClient.invalidateQueries([t.WAREHOUSE_TRANSFER, id]);
-
// Common invalidate queries.
commonInvalidateQueries(queryClient);
},
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 1419a417f..a4606f1d9 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1918,5 +1918,12 @@
"branche.error.warehouse_code_not_unique": "رمز الفرع ليس فريدًا ",
"branche.error.branch_has_associated_transactions": "لا يمكنك حذف هذا الفرع لأنه لديه معاملات مرتبطة به.",
"payment_Receive.error.payment_account_currency_invalid":"يجب أن تكون عملة حساب الإيداع هي نفس عملة العميل أو العملة الأساسية للمنشأة.",
- "payment_made.error.withdrawal_account_currency_invalid":"يجب أن تكون عملة حساب السحب هي نفس عملة المورد أو العملة الأساسية للمنشأة."
+ "payment_made.error.withdrawal_account_currency_invalid":"يجب أن تكون عملة حساب السحب هي نفس عملة المورد أو العملة الأساسية للمنشأة.",
+ "view_customer_details": "عرض تفاصيل العميل ",
+ "view_vendor_details": "عرض تفاصيل المورد ",
+ "thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!",
+ "terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+ "expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
+ "make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction"
+
}
\ No newline at end of file
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index da9ed80df..45d036563 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1916,5 +1916,9 @@
"payment_Receive.error.payment_account_currency_invalid": "The deposit account currency should be same customer currency or organization base currency.",
"payment_made.error.withdrawal_account_currency_invalid": "The withdrawal account currency should be same vendor currency or organization base currency.",
"view_customer_details": "View Customer Details",
- "view_vendor_details":"View Vendor Details"
+ "view_vendor_details": "View Vendor Details",
+ "thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!",
+ "terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+ "expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
+ "make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction"
}
\ No newline at end of file