diff --git a/src/containers/Purchases/Bills/BillForm/BillForm.schema.js b/src/containers/Purchases/Bills/BillForm/BillForm.schema.js index 6f77262b2..258ad5be4 100644 --- a/src/containers/Purchases/Bills/BillForm/BillForm.schema.js +++ b/src/containers/Purchases/Bills/BillForm/BillForm.schema.js @@ -1,16 +1,19 @@ import * as Yup from 'yup'; +import moment from 'moment'; import intl from 'react-intl-universal'; import { DATATYPES_LENGTH } from 'common/dataTypes'; import { isBlank } from 'utils'; const BillFormSchema = Yup.object().shape({ - vendor_id: Yup.number() - .required() - .label(intl.get('vendor_name_')), - bill_date: Yup.date() - .required() - .label(intl.get('bill_date_')), + vendor_id: Yup.number().required().label(intl.get('vendor_name_')), + bill_date: Yup.date().required().label(intl.get('bill_date_')), due_date: Yup.date() + .min(Yup.ref('bill_date'), ({ path, min }) => + intl.get('bill.validation.due_date', { + path, + min: moment(min).format('YYYY/MM/DD'), + }), + ) .required() .label(intl.get('due_date_')), bill_number: Yup.string() @@ -25,7 +28,7 @@ const BillFormSchema = Yup.object().shape({ open: Yup.boolean(), branch_id: Yup.string(), warehouse_id: Yup.string(), - exchange_rate:Yup.number(), + exchange_rate: Yup.number(), entries: Yup.array().of( Yup.object().shape({ quantity: Yup.number() diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 9d09a3bff..40e15203e 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2013,5 +2013,6 @@ "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", "make_journal.entries.remove_row": "حذف الصف", "expense.entries.remove_row": "حذف الصف", - "warehouse_transfer.entries.remove_row": "حذف الصف" + "warehouse_transfer.entries.remove_row": "حذف الصف", + "bill.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index dbd9b1e32..d0ed07859 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2013,5 +2013,6 @@ "estimate.validation.expiration_date": "{path} field must be later than {min}", "make_journal.entries.remove_row": "Remove line", "expense.entries.remove_row": "Remove line", - "warehouse_transfer.entries.remove_row": "Remove line" + "warehouse_transfer.entries.remove_row": "Remove line", + "bill.validation.due_date": "{path} field must be later than {min}" } \ No newline at end of file