From 0d6891afbf08229bcd223c021eb9c3a70e76aeae Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 14 Jun 2022 14:46:14 +0530
Subject: [PATCH] fix: parse value before setting display status

---
 .../js/frappe/form/controls/base_control.js   | 20 ++++++++++++++-----
 frappe/public/js/frappe/form/controls/date.js |  3 +++
 .../js/frappe/form/controls/datetime.js       |  3 +++
 .../js/frappe/form/controls/duration.js       |  6 ++++++
 frappe/public/js/frappe/form/controls/time.js |  3 +++
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js
index e22235f60f..f491fb1427 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -72,9 +72,12 @@ frappe.ui.form.Control = class BaseControl {
 				status = "Read";
 			}
 
+			let value = this.value || this.get_model_value();
+			value = this.get_parsed_value(value);
+
 			if (
 				status === "Read" &&
-				is_null(this.value) &&
+				is_null(value) &&
 				!in_list(["HTML", "Image", "Button"], this.df.fieldtype)
 			) status = "None";
 
@@ -93,9 +96,12 @@ frappe.ui.form.Control = class BaseControl {
 			}
 		}
 
+		let value = frappe.model.get_value(this.doctype, this.docname, this.df.fieldname);
+		value = this.get_parsed_value(value);
+
 		// hide if no value
 		if (this.doctype && status==="Read" && !this.only_input
-			&& is_null(frappe.model.get_value(this.doctype, this.docname, this.df.fieldname))
+			&& is_null(value)
 			&& !in_list(["HTML", "Image", "Button"], this.df.fieldtype)) {
 
 			// eslint-disable-next-line
@@ -159,14 +165,18 @@ frappe.ui.form.Control = class BaseControl {
 			return this.doc[this.df.fieldname];
 		}
 	}
+	get_parsed_value(value) {
+		if (this.parse) {
+			value = this.parse(value);
+		}
+		return value;
+	}
 
 	set_value(value, force_set_value=false) {
 		return this.validate_and_set_in_model(value, null, force_set_value);
 	}
 	parse_validate_and_set_in_model(value, e) {
-		if(this.parse) {
-			value = this.parse(value);
-		}
+		value = this.get_parsed_value(value);
 		return this.validate_and_set_in_model(value, e);
 	}
 	validate_and_set_in_model(value, e, force_set_value=false) {
diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js
index a8b82604c9..09517e742b 100644
--- a/frappe/public/js/frappe/form/controls/date.js
+++ b/frappe/public/js/frappe/form/controls/date.js
@@ -140,6 +140,9 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat
 	}
 	parse(value) {
 		if (value) {
+			if (value == "Invalid date") {
+				return "";
+			}
 			return frappe.datetime.user_to_str(value, false, true);
 		}
 	}
diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index 9b10465d7b..11dff265f2 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -40,6 +40,9 @@ frappe.ui.form.ControlDatetime = class ControlDatetime extends frappe.ui.form.Co
 				value = frappe.datetime.convert_to_system_tz(value, true);
 			}
 
+			if (value == "Invalid date") {
+				value = "";
+			}
 			return value;
 		}
 	}
diff --git a/frappe/public/js/frappe/form/controls/duration.js b/frappe/public/js/frappe/form/controls/duration.js
index 361d10982e..35c691a0ca 100644
--- a/frappe/public/js/frappe/form/controls/duration.js
+++ b/frappe/public/js/frappe/form/controls/duration.js
@@ -109,6 +109,12 @@ frappe.ui.form.ControlDuration = class ControlDuration extends frappe.ui.form.Co
 		return cint(this.value);
 	}
 
+	parse(value) {
+		if (!value) {
+			return "";
+		}
+	}
+
 	refresh_input() {
 		super.refresh_input();
 		this.set_duration_options();
diff --git a/frappe/public/js/frappe/form/controls/time.js b/frappe/public/js/frappe/form/controls/time.js
index f7fcc4c618..bbdec69cf8 100644
--- a/frappe/public/js/frappe/form/controls/time.js
+++ b/frappe/public/js/frappe/form/controls/time.js
@@ -82,6 +82,9 @@ frappe.ui.form.ControlTime = class ControlTime extends frappe.ui.form.ControlDat
 	}
 	parse(value) {
 		if (value) {
+			if (value == "Invalid date") {
+				value = "";
+			}
 			return frappe.datetime.user_to_str(value, true);
 		}
 	}