From f22592e581ab7fdb0ed19c3c9941b55e8c27c106 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 11 Jul 2016 16:06:03 +0530
Subject: [PATCH] [fix] formatter if no timezone is set

---
 frappe/public/js/frappe/form/formatters.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 32d8b2cc8f..5b76f7e3ed 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -96,9 +96,15 @@ frappe.form.formatters = {
 		return value || "";
 	},
 	Datetime: function(value) {
-		return value ? moment(dateutil.convert_to_user_tz(value))
-			.tz(frappe.boot.sysdefaults.time_zone).format('MMMM Do YYYY, h:mm a z') : "";
-		//return value ? dateutil.str_to_user(dateutil.convert_to_user_tz(value)) : "";
+		if(value) {
+			var m = moment(dateutil.convert_to_user_tz(value));
+			if(frappe.boot.sysdefaults.time_zone) {
+				m = m.tz(frappe.boot.sysdefaults.time_zone);
+			}
+			return m.format('MMMM Do YYYY, h:mm a z');
+		} else {
+			return "";
+		}
 	},
 	Text: function(value) {
 		if(value) {