From aa856c474aed9867bfeda8963c1536691ab1c28b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 18 Sep 2018 10:42:04 +0530 Subject: [PATCH] fix(setup wizard): Validate FY dates (#15419) - start date should be less than end date --- erpnext/public/js/setup_wizard.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index a030381b55..82d6f6e226 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -141,9 +141,7 @@ erpnext.setup.slides_settings = [ let me = this; let exist; - // validate fiscal year start and end dates - if (this.values.fy_start_date == 'Invalid date' || this.values.fy_end_date == 'Invalid date') { - frappe.msgprint(__("Please enter valid Financial Year Start and End Dates")); + if (!this.validate_fy_dates()) { return false; } @@ -170,6 +168,20 @@ erpnext.setup.slides_settings = [ return true; }, + validate_fy_dates: function() { + // validate fiscal year start and end dates + const invalid = this.values.fy_start_date == 'Invalid date' || + this.values.fy_end_date == 'Invalid date'; + const start_greater_than_end = this.values.fy_start_date > this.values.fy_end_date; + + if (invalid || start_greater_than_end) { + frappe.msgprint(__("Please enter valid Financial Year Start and End Dates")); + return false; + } + + return true; + }, + set_fy_dates: function (slide) { var country = frappe.wizard.values.country;