Merge remote-tracking branch 'origin/master'

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

@@ -186,7 +186,6 @@ function InvoiceForm({
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
-      resetForm();
 
       if (submitPayload.redirect) {
         history.push('/invoices');
@@ -230,7 +229,7 @@ function InvoiceForm({
     },
     [changePageSubtitle],
   );
-
+  
   return (
     <div className={classNames(
       CLASSES.PAGE_FORM,
@@ -260,9 +259,10 @@ function InvoiceForm({
             <InvoiceFormFooter />
             <InvoiceFloatingActions
               isSubmitting={isSubmitting}
-              invoice={invoice}
+              invoice={invoiceId}
               onCancelClick={handleCancelClick}
               onSubmitClick={handleSubmitClick}
+              invoicePublished={true}
             />
           </Form>
         )}