From 47c38a339ee9ad16de431a4a26b99a68cdc378fc Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 12 Sep 2021 16:50:14 +0200 Subject: [PATCH] BIG-12: fix reset button with invoice number. --- .../Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js | 5 +---- .../src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js index ecaa99018..d1dd532ca 100644 --- a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js +++ b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.js @@ -25,10 +25,7 @@ export default function InvoiceFloatingActions() { const history = useHistory(); // Formik context. - const { isSubmitting } = useFormikContext(); - - // Formik context. - const { resetForm, submitForm } = useFormikContext(); + const { resetForm, submitForm, isSubmitting } = useFormikContext(); // Invoice form context. const { setSubmitPayload, invoice } = useInvoiceFormContext(); diff --git a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js index 11d4d3371..f67a7dc52 100644 --- a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js +++ b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js @@ -177,7 +177,7 @@ export default compose( withSettings(({ invoiceSettings }) => ({ invoiceNextNumber: invoiceSettings?.nextNumber, invoiceNumberPrefix: invoiceSettings?.numberPrefix, - invoiceIncrementMode: invoiceSettings?.incrementMode, + invoiceIncrementMode: invoiceSettings?.autoIncrement, })), withCurrentOrganization(), )(InvoiceForm);