From ab3d1849bfd0a3cba42d273f62a93c06c6f5734b Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 14 Jun 2016 18:09:07 +0530
Subject: [PATCH] [minor]

---
 frappe/core/doctype/doctype/doctype.js        | 10 ++++-----
 .../doctype/customize_form/customize_form.js  |  1 +
 frappe/model/db_query.py                      |  2 +-
 .../js/frappe/views/reports/query_report.js   | 22 +++++++++----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 0bfa4947a8..c4019ec8f8 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -5,11 +5,11 @@
 // Menu Display
 // -------------
 
-$(cur_frm.wrapper).on("grid-row-render", function(e, grid_row) {
-	if(grid_row.doc && grid_row.doc.fieldtype=="Section Break") {
-		$(grid_row.row).css({"font-weight": "bold"});
-	}
-})
+// $(cur_frm.wrapper).on("grid-row-render", function(e, grid_row) {
+// 	if(grid_row.doc && grid_row.doc.fieldtype=="Section Break") {
+// 		$(grid_row.row).css({"font-weight": "bold"});
+// 	}
+// })
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	if(doc.__islocal && (user !== "Administrator" || !frappe.boot.developer_mode)) {
diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index 08c059ff9e..b6a694c874 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -45,6 +45,7 @@ frappe.ui.form.on("Customize Form", {
 	},
 
 	setup_sortable: function(frm) {
+		frm.page.body.find('.highlight').removeClass('highlight');
 		frm.doc.fields.forEach(function(f, i) {
 			var data_row = frm.page.body.find('[data-fieldname="fields"] [data-idx="'+ f.idx +'"] .data-row');
 
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index e25cc01d7b..e001d42d8d 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -319,7 +319,7 @@ class DatabaseQuery(object):
 				column_name = "date_format({tname}.{fname}, '%Y-%m-%d')".format(tname=tname,
 					fname=f.fieldname)
 
-		if self.ignore_ifnull or not can_be_null:
+		if self.ignore_ifnull or not can_be_null or (value and f.operator in ('=', 'like')):
 			condition = '{column_name} {operator} {value}'.format(
 				column_name=column_name, operator=f.operator,
 				value=value)
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 31e163312b..422a30839d 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -374,11 +374,11 @@ frappe.views.QueryReport = Class.extend({
 		if (this.get_query_report_opts().tree) {
 			this.setup_tree();
 		}
-		
-		this.set_message(res.message);		
+
+		this.set_message(res.message);
 		this.setup_chart(res);
 	},
-	
+
 	make_columns: function(columns) {
 		var me = this;
 		var formatter = this.get_formatter();
@@ -717,7 +717,7 @@ frappe.views.QueryReport = Class.extend({
 		frappe.tools.downloadify(result, null, this.title);
 		return false;
 	},
-	
+
 	set_message: function(msg) {
 		if(msg) {
 			this.wrapper.find(".help-msg").html(msg).toggle(true);
@@ -725,25 +725,25 @@ frappe.views.QueryReport = Class.extend({
 			this.wrapper.find(".help-msg").empty().toggle(false);
 		}
 	},
-	
+
 	setup_chart: function(res) {
 		var me = this;
 		this.wrapper.find(".chart_area").parent().toggle(false);
-		
+
 		if (this.get_query_report_opts().get_chart_data) {
-			var opts = query_report_opts.get_chart_data(res.columns, res.result);
+			var opts = this.get_query_report_opts().get_chart_data(res.columns, res.result);
 		} else if (res.chart) {
 			var opts = res.chart;
 		}
-		
+
 		$.extend(opts, {
 			wrapper: me.wrapper,
 			bind_to: ".chart_area"
 		});
-		
+
 		this.chart = new frappe.ui.Chart(opts);
-		if(this.chart) 
+		if(this.chart)
 			this.wrapper.find(".chart_area").parent().toggle(true);
-		
+
 	}
 })