From f328d7928cdc2ac4c413b62c5dcc695d7ebae016 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 25 Jun 2020 12:04:55 +0530
Subject: [PATCH] fix(prettyDate): Convert datetime to user's timezone first

---
 frappe/public/js/frappe/utils/pretty_date.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/pretty_date.js b/frappe/public/js/frappe/utils/pretty_date.js
index 7618d58829..84fd276068 100644
--- a/frappe/public/js/frappe/utils/pretty_date.js
+++ b/frappe/public/js/frappe/utils/pretty_date.js
@@ -1,8 +1,10 @@
 function prettyDate(date, mini) {
 	if (!date) return '';
 
-	if (typeof (date) == "string")
+	if (typeof (date) == "string") {
+		date = frappe.datetime.convert_to_user_tz(date);
 		date = new Date((date || "").replace(/-/g, "/").replace(/[TZ]/g, " ").replace(/\.[0-9]*/, ""));
+	}
 
 	let diff = (((new Date()).getTime() - date.getTime()) / 1000);
 	let day_diff = Math.floor(diff / 86400);