Merge branch 'develop' into BIG-141-add-inactive-status-to-item-drawer-details

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()
+  vendor_id: Yup.number().required().label(intl.get('vendor_name_')),
-    .required()
+  bill_date: Yup.date().required().label(intl.get('bill_date_')),
-    .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()

src/lang/ar/index.json

@@ -2014,5 +2014,6 @@
   "make_journal.entries.remove_row": "حذف الصف",
   "expense.entries.remove_row": "حذف الصف",
   "warehouse_transfer.entries.remove_row": "حذف الصف",
-  "item.details.inactive": "غير نشط"
+  "item.details.inactive": "غير نشط",
+  "bill.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}"
 }

src/lang/en/index.json

@@ -2014,5 +2014,6 @@
   "make_journal.entries.remove_row": "Remove line",
   "expense.entries.remove_row": "Remove line",
   "warehouse_transfer.entries.remove_row": "Remove line",
-  "item.details.inactive": "Inactive"
+  "item.details.inactive": "Inactive",
+  "bill.validation.due_date": "{path} field must be later than {min}"
 }