From 74a5e8dd1d007e262aa1c5b8f5b7fac762da7dc6 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Wed, 28 Oct 2020 19:13:32 +0200
Subject: [PATCH 1/2] FIx: Bill Entries validation

---
 client/src/containers/Purchases/Bill/BillForm.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index 15b2c5904..45ab5a693 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -103,7 +103,12 @@ function BillForm({
       .label(formatMessage({ id: 'note' })),
     entries: Yup.array().of(
       Yup.object().shape({
-        quantity: Yup.number().nullable(),
+        quantity: Yup.number()
+          .nullable()
+          .when(['rate'], {
+            is: (rate) => rate,
+            then: Yup.number().required(),
+          }),
         rate: Yup.number().nullable(),
         item_id: Yup.number()
           .nullable()

From 3db9c8b8369adec46235e7dabb36697b0d1bd777 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Wed, 28 Oct 2020 19:15:03 +0200
Subject: [PATCH 2/2] Fix :Bill Entries validation

---
 client/src/containers/Purchases/Bill/BillForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index 45ab5a693..47c800e5a 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -212,7 +212,7 @@ function BillForm({
     initialValues: {
       ...initialValues,
     },
-    onSubmit: async (values, { setSubmitting, setErrors, resetForm }) => {
+    onSubmit: (values, { setSubmitting, setErrors, resetForm }) => {
       setSubmitting(true);
 
       const form = {