From f6ed74629bdf6e6c705a527cd3003d4ead759c05 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 5 Jul 2017 20:41:02 +0530 Subject: [PATCH] [minor] control.js fix t-for-today --- frappe/public/js/frappe/form/control.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 063456a881..60bdbe9c32 100755 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -712,14 +712,11 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({ this.$input.on("keydown", function(e) { if(e.which===84) { // 84 === t if(me.df.fieldtype=='Date') { - me.set_value(frappe.datetime.str_to_user( - frappe.datetime.nowdate())); + me.set_value(frappe.datetime.nowdate()); } if(me.df.fieldtype=='Datetime') { - me.set_value(frappe.datetime.str_to_user( - frappe.datetime.now_datetime())); + me.set_value(frappe.datetime.now_datetime()); } if(me.df.fieldtype=='Time') { - me.set_value(frappe.datetime.str_to_user( - frappe.datetime.now_time())); + me.set_value(frappe.datetime.now_time()); } return false; }