diff --git a/frappe/desk/form/document_flow.py b/frappe/desk/form/document_flow.py
index 169b8044c4..dee0053ae2 100644
--- a/frappe/desk/form/document_flow.py
+++ b/frappe/desk/form/document_flow.py
@@ -16,17 +16,38 @@ def get_document_completion_status(doctypes, frm_doctype, frm_docname):
 	
 	flow_completion = {}
 	
-	for item in doc.items:
+	if hasattr(doc, "prev_link_mapper"):
 		for doctype in doc.prev_link_mapper:
 			fieldname = doc.prev_link_mapper[doctype]["fieldname"]
-			if item.as_dict()[fieldname]:
+			lookup_doctype = doc.prev_link_mapper[doctype]["doctype"]
+			limit = doc.prev_link_mapper[doctype].get("limit") or 1
+			condition = make_condition(doc.prev_link_mapper[doctype].get("filters"))
+			
+			if condition:
+				condition = "where {condition}".format(condition=condition)
+			else:
+				condition = ""
+
+			result = frappe.db.sql_list("select {fieldname} from `tab{doctype}` \
+				{condition} limit {limit}".format(fieldname=fieldname, doctype=lookup_doctype,
+				condition=condition, limit=limit))
+
+			if result:
 				flow_completion[doctype] = True
-	
+
 	for doctype in doctypes:
 		if doctype not in flow_completion:
 			links = get_linked_docs(frm_doctype, frm_docname, linkinfo, for_doctype=doctype)
-			frappe.errprint(links)
 			if links:
 				flow_completion[doctype] = True
-		
-	return flow_completion
\ No newline at end of file
+
+	return flow_completion
+
+def make_condition(filters=None):
+	condition = []
+	if filters and isinstance(filters, list):
+		for cond in filters:
+			condition.append("`tab{0}`.{1} {2} '{3}'".format(*cond))
+	
+	return " and ".join(condition)
+		
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/document_flow.js b/frappe/public/js/frappe/form/document_flow.js
index 0493879a8d..9dc3a5b81c 100644
--- a/frappe/public/js/frappe/form/document_flow.js
+++ b/frappe/public/js/frappe/form/document_flow.js
@@ -72,15 +72,13 @@ frappe.ui.form.DocumentFlow = Class.extend({
 				frm_docname: me.frm.docname
 			},
 			callback: function(r){
-				if (!r.exc) {
-					$.each(me.doctypes, function(i, doctype) {
-						if (r.message[doctype] && me.frm.doctype!=doctype) {
-							me.wrapper.find("[data-doctype='"+doctype+"']a .indicator")
-								.removeClass("darkgrey")
-								.addClass("black")
-						}
-					})
-				}
+				$.each(me.doctypes, function(i, doctype) {
+					if (r.message[doctype] && me.frm.doctype!=doctype) {
+						me.wrapper.find("[data-doctype='"+doctype+"']a .indicator")
+							.removeClass("darkgrey")
+							.addClass("black")
+					}
+				})
 			}
 		})
 	}