From 63b06420e161f8481ac53e3a04d92eef737fda39 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 5 Jul 2017 17:56:04 +0530 Subject: [PATCH] [fix] setup wizard dates (#9646) --- erpnext/public/js/setup_wizard.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 3e63c680d7e..43b45d91bc3 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -145,11 +145,11 @@ var erpnext_slides = [ var year_start_date = current_year + "-" + fy[0]; if (year_start_date > frappe.datetime.get_today()) { - next_year = current_year + next_year = current_year; current_year -= 1; } - slide.get_field("fy_start_date").set_value(current_year + "-" + fy[0]); - slide.get_field("fy_end_date").set_value(next_year + "-" + fy[1]); + slide.get_field("fy_start_date").set_value(current_year + '-' + fy[0]); + slide.get_field("fy_end_date").set_value(next_year + '-' + fy[1]); } }, @@ -180,13 +180,11 @@ var erpnext_slides = [ }, bind_events: function (slide) { - - // TODO remove this slide.get_input("fy_start_date").on("change", function () { + var start_date = slide.form.fields_dict.fy_start_date.get_value(); var year_end_date = - frappe.datetime.add_days(frappe.datetime.add_months( - frappe.datetime.user_to_obj(slide.get_input("fy_start_date").val()), 12), -1); - slide.form.fields_dict.fy_end_date.set_value(frappe.datetime.obj_to_user(year_end_date)); + frappe.datetime.add_days(frappe.datetime.add_months(start_date, 12), -1); + slide.form.fields_dict.fy_end_date.set_value(year_end_date); }); } },