From 820b688c4493c908d58cda78e15ddb1f61f52fdf Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 21 Dec 2015 11:26:24 +0530 Subject: [PATCH] [fix] handle invalid date in formatter. Fixes frappe/erpnext#4468 --- frappe/public/js/frappe/form/formatters.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 6ec7364082..d3fa5c1d56 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -85,7 +85,15 @@ frappe.form.formatters = { } }, Date: function(value) { - return value ? dateutil.str_to_user(value) : ""; + if (value) { + value = dateutil.str_to_user(value); + // handle invalid date + if (value==="Invalid date") { + value = null; + } + } + + return value || ""; }, Datetime: function(value) { return value ? dateutil.str_to_user(dateutil.convert_to_user_tz(value)) : "";