Merge branch 'master' of github.com:webnotes/wnframework into website-wip

public/js/wn/model/meta.js

@@ -117,7 +117,7 @@ $.extend(wn.meta, {
 		var currency = wn.boot.sysdefaults.currency;
 		if(!doc && cur_frm) 
 			doc = cur_frm.doc;
-			
+	
 		if(df && df.options) {
 			if(doc && df.options.indexOf(":")!=-1) {
 				var options = df.options.split(":");
@@ -127,7 +127,9 @@ $.extend(wn.meta, {
 					if(!docname && cur_frm) {
 						docname = cur_frm.doc[options[1]];
 					}
-					currency = wn.model.get_value(options[0], docname, options[2]) || currency;
+					currency = wn.model.get_value(options[0], docname, options[2]) || 
+						wn.model.get_value(":" + options[0], docname, options[2]) || 
+						currency;
 				}
 			} else if(doc && doc[df.options]) {
 				currency = doc[df.options];

public/js/wn/views/query_report.js

@@ -188,9 +188,9 @@ wn.views.QueryReport = Class.extend({
 				if(c.indexOf(":")!=-1) {
 					var opts = c.split(":");
 					var df = {
-						label: opts.slice(0, opts.length - 2).join(":"),
-						fieldtype: opts[opts.length - 2],
-						width: opts[opts.length - 1]
+						label: opts.length<=2 ? opts[0] : opts.slice(0, opts.length - 2).join(":"),
+						fieldtype: opts.length<=2 ? opts[1] : opts[opts.length - 2],
+						width: opts.length<=2 ? opts[2] : opts[opts.length - 1]
 					}
 					
 					if(!df.fieldtype) 

webnotes/test_runner.py

@@ -50,7 +50,6 @@ def get_dependencies(doctype):
 		for doctype_name in test_module.test_ignore:
 			if doctype_name in options_list:
 				options_list.remove(doctype_name)
-	
 	return options_list
 
 def make_test_records_for_doctype(doctype, verbose=0):