From 1dc4968c3ad71da0db6fc7d95648e39b0af06fb3 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Tue, 3 Jun 2014 14:10:53 +0530
Subject: [PATCH] Fixes frappe/erpnext#1732 and frappe/erpnext#1733

---
 frappe/public/js/frappe/dom.js      | 11 ++++++++---
 frappe/public/js/legacy/datatype.js |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index 75df706536..1fec30516c 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -243,9 +243,14 @@ frappe.dom.set_box_shadow = function(ele, spread) {
 		// create options
 		for(var i=0; i<options_list.length; i++) {
 			var v = options_list[i];
-			value = v!=null ? (v.value==undefined ? v : v.value) : null;
-			label = v!=null ? (__(v.label || v)) : null;
-			$('<option>').html(label || "").attr('value', value).appendTo(this);
+			if (is_null(v)) {
+				var value = null;
+				var label = null;
+			} else {
+				var value = is_null(v.value) ? v : v.value;
+				var label = is_null(v.label) ? __(v) : __(v.label);
+			}
+			$('<option>').html(cstr(label)).attr('value', value).appendTo(this);
 		}
 		// select the first option
 		this.selectedIndex = 0;
diff --git a/frappe/public/js/legacy/datatype.js b/frappe/public/js/legacy/datatype.js
index 5994e1011c..8bd282bd4f 100644
--- a/frappe/public/js/legacy/datatype.js
+++ b/frappe/public/js/legacy/datatype.js
@@ -23,7 +23,7 @@ function toTitle(str){
 }
 
 function is_null(v) {
-	if(v===null || v===undefined || (v || "").trim()==="") return true;
+	if(v===null || v===undefined || cstr(v).trim()==="") return true;
 }
 
 function set_value_in(ele, v, ftype, fopt, doc) {