Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] setup wizard dates (#9646)

Browse Source
This commit is contained in:
Rushabh Mehta 2017-07-05 17:56:04 +05:30 committed by GitHub
parent bf66d7e041
commit 63b06420e1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/public/js/setup_wizard.js
View File

@ -145,11 +145,11 @@ var erpnext_slides = [
var year_start_date = current_year + "-" + fy[0]; var year_start_date = current_year + "-" + fy[0];
if (year_start_date > frappe.datetime.get_today()) { if (year_start_date > frappe.datetime.get_today()) {
next_year = current_year next_year = current_year;
current_year -= 1; current_year -= 1;
} }
slide.get_field("fy_start_date").set_value(current_year + "-" + fy[0]); 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_end_date").set_value(next_year + '-' + fy[1]);
} }
}, },
@ -180,13 +180,11 @@ var erpnext_slides = [
}, },
bind_events: function (slide) { bind_events: function (slide) {
// TODO remove this
slide.get_input("fy_start_date").on("change", function () { 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 = var year_end_date =
frappe.datetime.add_days(frappe.datetime.add_months( frappe.datetime.add_days(frappe.datetime.add_months(start_date, 12), -1);
frappe.datetime.user_to_obj(slide.get_input("fy_start_date").val()), 12), -1); slide.form.fields_dict.fy_end_date.set_value(year_end_date);
slide.form.fields_dict.fy_end_date.set_value(frappe.datetime.obj_to_user(year_end_date));
}); });
} }
}, },