Merge pull request #3809 from nabinhait/journal_entry_fix

[fix] Party / Account Validation message against Invoice
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.py b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
index eaccc8c..55d5937 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.py
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
@@ -15,6 +15,8 @@
 
 	def validate(self):
 		self.set_status()
+		self.total_hours = 0.0
+		self.total_billing_amount = 0.0
 		for d in self.get("time_logs"):
 			tl = frappe.get_doc("Time Log", d.time_log)
 			self.update_time_log_values(d, tl)
diff --git a/erpnext/templates/pages/product_search.py b/erpnext/templates/pages/product_search.py
index 236fe5c..f4c4534 100644
--- a/erpnext/templates/pages/product_search.py
+++ b/erpnext/templates/pages/product_search.py
@@ -33,7 +33,7 @@
 
 	for d in data:
 		d.route = ((d.parent_website_route + "/") if d.parent_website_route else "") \
-			+ d.page_name
+			+ (d.page_name or "")
 
 	return [get_item_for_list_in_html(r) for r in data]