Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/projects/doctype/time_log/time_log.py b/projects/doctype/time_log/time_log.py
index fe5d287..8ab46c1 100644
--- a/projects/doctype/time_log/time_log.py
+++ b/projects/doctype/time_log/time_log.py
@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 import webnotes
 from webnotes import _
+from webnotes.utils import cstr
 
 from webnotes.widgets.reportview import build_match_conditions
 
@@ -41,9 +42,11 @@
 				(to_time between %s and %s) or 
 				(%s between from_time and to_time)) 
 			and name!=%s
+			and ifnull(task, "")=%s
 			and docstatus < 2""", 
 			(self.doc.owner, self.doc.from_time, self.doc.to_time, self.doc.from_time, 
-				self.doc.to_time, self.doc.from_time, self.doc.name or "No Name"))
+				self.doc.to_time, self.doc.from_time, self.doc.name or "No Name",
+				cstr(self.doc.task)))
 
 		if existing:
 			webnotes.msgprint(_("This Time Log conflicts with") + ":" + ', '.join(existing),
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index d34261d..e15565a 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -310,8 +310,10 @@
 	var callback = function(r, rt) {
 		cur_frm.cscript.item_code(doc, cdt, cdn);
 	}
-	get_server_fields('get_barcode_details', d.barcode, cur_frm.cscript.fname, 
+	if(d.barcode) {
+		get_server_fields('get_barcode_details', d.barcode, cur_frm.cscript.fname, 
 		doc, cdt, cdn, 1, callback);
+	}
 }
 
 cur_frm.fields_dict[cur_frm.cscript.fname].grid.get_field('batch_no').get_query =