diff --git a/frappe/public/js/frappe/form/document_flow.js b/frappe/public/js/frappe/form/document_flow.js
index 43cd4e784b..8d4b4626f9 100644
--- a/frappe/public/js/frappe/form/document_flow.js
+++ b/frappe/public/js/frappe/form/document_flow.js
@@ -63,7 +63,7 @@ frappe.ui.form.DocumentFlow = Class.extend({
 
 		this.linked_with[for_doctype].show();
 	},
-	
+
 	mark_completed_flow: function() {
 		var me = this;
 		frappe.call({
@@ -74,6 +74,9 @@ frappe.ui.form.DocumentFlow = Class.extend({
 				frm_docname: me.frm.docname
 			},
 			callback: function(r){
+				if(!r.message) {
+					return;
+				}
 				$.each(me.doctypes, function(i, doctype) {
 					if (r.message[doctype] && me.frm.doctype!=doctype) {
 						me.wrapper.find("[data-doctype='"+doctype+"']a .indicator")
diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js
index dcb6c6af76..d2b1414733 100644
--- a/frappe/public/js/frappe/list/doclistview.js
+++ b/frappe/public/js/frappe/list/doclistview.js
@@ -351,6 +351,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
 								doctype = d.options;
 								return false;
 							}
+							return true;
 						});
 
 						if(!doctype) {
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 6a55f2cef7..2cd53af13a 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -365,7 +365,7 @@ _f.Frm.prototype.show_web_link = function() {
 
 _f.Frm.prototype.add_web_link = function(path) {
 	this.web_link = this.sidebar.add_user_action("See on Website",
-		function() {}).attr("href", this.doc.route).attr("target", "_blank");
+		function() {}).attr("href", path || this.doc.route).attr("target", "_blank");
 }
 
 _f.Frm.prototype.check_doc_perm = function() {
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 59a7ddd34a..aec115210a 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -133,8 +133,8 @@ def convert_utc_to_user_timezone(utc_timestamp):
 
 def now():
 	"""return current datetime as yyyy-mm-dd hh:mm:ss"""
-	if getattr(frappe.local, "current_date", None):
-		return getdate(frappe.local.current_date).strftime(DATE_FORMAT) + " " + \
+	if frappe.flags.current_date:
+		return getdate(frappe.flags.current_date).strftime(DATE_FORMAT) + " " + \
 			now_datetime().strftime(TIME_FORMAT)
 	else:
 		return now_datetime().strftime(DATETIME_FORMAT)
diff --git a/frappe/utils/make_random.py b/frappe/utils/make_random.py
index f9f4e289e5..711e307d26 100644
--- a/frappe/utils/make_random.py
+++ b/frappe/utils/make_random.py
@@ -25,7 +25,7 @@ def add_random_children(doc, fieldname, rows, randomize, unique=None):
 		else:
 			doc.append(fieldname, d)
 
-def get_random(doctype, filters=None):
+def get_random(doctype, filters=None, doc=False):
 	condition = []
 	if filters:
 		for key, val in filters.items():
@@ -38,7 +38,12 @@ def get_random(doctype, filters=None):
 	out = frappe.db.sql("""select name from `tab%s` %s
 		order by RAND() limit 0,1""" % (doctype, condition))
 
-	return out and out[0][0] or None
+	out = out and out[0][0] or None
+
+	if doc and out:
+		return frappe.get_doc(doctype, out)
+	else:
+		return out
 
 def can_make(doctype):
 	return random.random() < settings.prob.get(doctype, settings.prob["default"])["make"]
diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py
index 327a055d0c..1f1802c76c 100644
--- a/frappe/utils/setup_docs.py
+++ b/frappe/utils/setup_docs.py
@@ -7,7 +7,6 @@ Call from command line:
 """
 
 import os, json, frappe, shutil, re
-import frappe.website.statics
 from frappe.website.context import get_context
 from frappe.utils import markdown