QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 13:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Entries validation

Browse Source
This commit is contained in:
elforjani3
2020-10-28 17:40:30 +02:00
parent 23d840be4f
commit b6d6e36574
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/containers/Sales/Estimate/EstimateForm.js
View File

@@ -116,7 +116,13 @@ const EstimateForm = ({
.label(formatMessage({ id: 'note' })), .label(formatMessage({ id: 'note' })),
entries: Yup.array().of( entries: Yup.array().of(
Yup.object().shape({ 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() item_id: Yup.number()
.nullable() .nullable()
.when(['quantity', 'rate'], { .when(['quantity', 'rate'], {

7
client/src/containers/Sales/Invoice/InvoiceForm.js
View File

@@ -115,7 +115,12 @@ function InvoiceForm({
entries: Yup.array().of( entries: Yup.array().of(
Yup.object().shape({ Yup.object().shape({
quantity: Yup.number().nullable(), quantity: Yup.number()
.nullable()
.when(['rate'], {
is: (rate) => rate,
then: Yup.number().required(),
}),
rate: Yup.number().nullable(), rate: Yup.number().nullable(),
item_id: Yup.number() item_id: Yup.number()
.nullable() .nullable()

7
client/src/containers/Sales/Receipt/ReceiptForm.js
View File

@@ -116,7 +116,12 @@ function ReceiptForm({
entries: Yup.array().of( entries: Yup.array().of(
Yup.object().shape({ Yup.object().shape({
quantity: Yup.number().nullable(), quantity: Yup.number()
.nullable()
.when(['rate'], {
is: (rate) => rate,
then: Yup.number().required(),
}),
rate: Yup.number().nullable(), rate: Yup.number().nullable(),
item_id: Yup.number() item_id: Yup.number()
.nullable() .nullable()