diff --git a/client/src/containers/Purchases/Bill/BillFloatingActions.js b/client/src/containers/Purchases/Bill/BillFloatingActions.js
index bdadae9e8..dbbecbc2e 100644
--- a/client/src/containers/Purchases/Bill/BillFloatingActions.js
+++ b/client/src/containers/Purchases/Bill/BillFloatingActions.js
@@ -9,10 +9,10 @@ import {
   Menu,
   MenuItem,
 } from '@blueprintjs/core';
-import { useFormikContext } from 'formik';
 import { FormattedMessage as T } from 'react-intl';
 import { CLASSES } from 'common/classes';
 import classNames from 'classnames';
+import { useFormikContext } from 'formik';
 import { saveInvoke } from 'utils';
 import { If, Icon } from 'components';
 
@@ -22,17 +22,16 @@ import { If, Icon } from 'components';
 export default function BillFloatingActions({
   isSubmitting,
   onSubmitClick,
-  onSubmitAndNewClick,
   onCancelClick,
   onClearClick,
   billId,
   billPublished,
 }) {
   const { resetForm, submitForm } = useFormikContext();
-
   const handleSubmitPublishBtnClick = (event) => {
     saveInvoke(onSubmitClick, event, {
       redirect: true,
+      publish: true,
     });
   };
 
@@ -73,7 +72,7 @@ export default function BillFloatingActions({
     submitForm();
     saveInvoke(onSubmitClick, event, {
       redirect: false,
-      publish: true,
+      publish: false,
     });
   };
 
@@ -89,7 +88,7 @@ export default function BillFloatingActions({
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Publish ----------- */}
-      <If condition={!billId}>
+      <If condition={!billId || !billPublished}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -121,36 +120,6 @@ export default function BillFloatingActions({
             />
           </Popover>
         </ButtonGroup>
-      </If>
-      {/* ----------- Save and New ----------- */}
-      <If condition={billId && billPublished}>
-        <ButtonGroup>
-          <Button
-            disabled={isSubmitting}
-            intent={Intent.PRIMARY}
-            type="submit"
-            onClick={handleSubmitPublishBtnClick}
-            text={<T id={'save'} />}
-          />
-          <Popover
-            content={
-              <Menu>
-                <MenuItem
-                  text={<T id={'save_and_new'} />}
-                  onClick={handleSubmitPublishAndNewBtnClick}
-                />
-              </Menu>
-            }
-            minimal={true}
-            interactionKind={PopoverInteractionKind.CLICK}
-            position={Position.BOTTOM_LEFT}
-          >
-            <Button
-              intent={Intent.PRIMARY}
-              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
-            />
-          </Popover>
-        </ButtonGroup>
         {/* ----------- Save As Draft ----------- */}
         <ButtonGroup>
           <Button
@@ -183,6 +152,37 @@ export default function BillFloatingActions({
           </Popover>
         </ButtonGroup>
       </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={billId && billPublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+
       {/* ----------- Clear & Reset----------- */}
       <Button
         className={'ml1'}
diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index 01b9cc136..42a4b8303 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -35,7 +35,7 @@ const defaultBill = {
   index: 0,
   item_id: '',
   rate: '',
-  discount: '',
+  discount: 0,
   quantity: '',
   description: '',
 };
@@ -50,6 +50,9 @@ const defaultInitialValues = {
   entries: [...repeatValue(defaultBill, MIN_LINES_NUMBER)],
 };
 
+/**
+ * Bill form.
+ */
 function BillForm({
   //#WithMedia
   requestSubmitMedia,
@@ -79,12 +82,12 @@ function BillForm({
   const isNewMode = !billId;
 
   useEffect(() => {
-    if (bill && bill.id) {
+    if (!isNewMode) {
       changePageTitle(formatMessage({ id: 'edit_bill' }));
     } else {
       changePageTitle(formatMessage({ id: 'new_bill' }));
     }
-  }, [changePageTitle, bill, formatMessage]);
+  }, [changePageTitle, isNewMode, formatMessage]);
 
   // Initial values in create and edit mode.
   const initialValues = useMemo(
@@ -146,12 +149,13 @@ function BillForm({
     };
     // Handle the request success.
     const onSuccess = (response) => {
+      console.log(submitPayload, 'EE');
       AppToaster.show({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_bill_has_been_successfully_created'
-              : 'the_bill_has_been_successfully_edited',
+              ? 'the_bill_has_been_successfully_edited'
+              : 'the_bill_has_been_successfully_created',
           },
           { number: values.bill_number },
         ),
@@ -173,7 +177,7 @@ function BillForm({
       handleErrors(errors, { setErrors });
       setSubmitting(false);
     };
-    if (isNewMode) {
+    if (bill && bill.id) {
       requestEditBill(bill.id, form).then(onSuccess).catch(onError);
     } else {
       requestSubmitBill(form).then(onSuccess).catch(onError);
@@ -214,7 +218,7 @@ function BillForm({
         initialValues={initialValues}
         onSubmit={handleFormSubmit}
       >
-        {({ isSubmitting, values }) => (
+        {({ isSubmitting }) => (
           <Form>
             <BillFormHeader onBillNumberChanged={handleBillNumberChanged} />
             <EditableItemsEntriesTable
@@ -230,7 +234,7 @@ function BillForm({
               billId={billId}
               billPublished={true}
               onSubmitClick={handleSubmitClick}
-              onCancelForm={handleCancelClick}
+              onCancelClick={handleCancelClick}
             />
           </Form>
         )}