From cba28a2ba06db1bd753aed07b5e6fb47808cdf18 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 20 Feb 2015 10:49:23 +0530
Subject: [PATCH] [fixes] tree and frappe/erpnext#2717

---
 frappe/public/js/frappe/form/control.js    | 7 +++++--
 frappe/public/js/frappe/form/formatters.js | 3 +++
 frappe/public/js/frappe/ui/tree.js         | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index afdb9ddedb..acc050caa6 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -129,10 +129,13 @@ frappe.ui.form.ControlImage = frappe.ui.form.Control.extend({
 			.css({"margin-bottom": "10px", "max-width": "100%"})
 
 		this.$wrapper.on("refresh", function() {
+				var doc = null;
 				me.$body.empty();
 
-				var doc = frappe.model.get_doc(me.doctype, me.docname);
-				if(me.df.options && doc[me.df.options]) {
+				if(me.docname) {
+					var doc = frappe.model.get_doc(me.doctype, me.docname);
+				}
+				if(doc && me.df.options && doc[me.df.options]) {
 					me.$img = $("<img src='"+doc[me.df.options]+"' style='max-width: 100%;'>")
 						.appendTo(me.$body);
 				} else {
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index cbb9394992..2a1d1af1bb 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -78,6 +78,9 @@ frappe.form.formatters = {
 	Date: function(value) {
 		return value ? dateutil.str_to_user(value) : "";
 	},
+	Datetime: function(value) {
+		return value ? dateutil.str_to_user(value) : "";
+	},
 	Text: function(value) {
 		if(value) {
 			var tags = ["<p", "<div", "<br"];
diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js
index 77c49e469a..a221051215 100644
--- a/frappe/public/js/frappe/ui/tree.js
+++ b/frappe/public/js/frappe/ui/tree.js
@@ -81,7 +81,7 @@ frappe.ui.TreeNode = Class.extend({
 		if(this.expandable) {
 			icon_html = '<i class="icon-fixed-width icon-folder-close text-muted"></i>';
 		}
-		$(icon_html + ' <a class="tree-label grey h6">' + this.label + "</a>").
+		$(icon_html + ' <a class="tree-label grey h6">' + __(this.label) + "</a>").
 			appendTo(this.$a);
 
 		this.$a.find('i').click(function() {