Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ahmed Bouhuolia
2020-10-28 22:41:25 +02:00

View File

@@ -103,7 +103,12 @@ function BillForm({
.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(), rate: Yup.number().nullable(),
item_id: Yup.number() item_id: Yup.number()
.nullable() .nullable()
@@ -207,7 +212,7 @@ function BillForm({
initialValues: { initialValues: {
...initialValues, ...initialValues,
}, },
onSubmit: async (values, { setSubmitting, setErrors, resetForm }) => { onSubmit: (values, { setSubmitting, setErrors, resetForm }) => {
setSubmitting(true); setSubmitting(true);
const form = { const form = {