diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index c394cc93e9a38851d4d8d7d16dd979ff552fd3fa..599749b467c8021b4a62d5e0afc048f9877058b1 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -101,7 +101,10 @@ status_map = {
 		["To Bill", "eval:self.per_billed == 0 and self.docstatus == 1"],
 		["Partly Billed", "eval:self.per_billed > 0 and self.per_billed < 100 and self.docstatus == 1"],
 		["Return Issued", "eval:self.per_returned == 100 and self.docstatus == 1"],
-		["Completed", "eval:self.per_billed == 100 and self.docstatus == 1"],
+		[
+			"Completed",
+			"eval:(self.per_billed >= 100 and self.docstatus == 1) or (self.docstatus == 1 and self.grand_total == 0 and self.per_returned != 100 and self.is_return == 0)",
+		],
 		["Cancelled", "eval:self.docstatus==2"],
 		["Closed", "eval:self.status=='Closed' and self.docstatus != 2"],
 	],
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
index 6e006fc0d16e667ba7280d11e99a140cbb7ae37f..af314707d3779c1ed743341df1a1096e608cc917 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
@@ -12,8 +12,8 @@ frappe.listview_settings['Purchase Receipt'] = {
 			return [__("To Bill"), "orange", "per_billed,<,100|docstatus,=,1"];
 		} else if (flt(doc.per_billed, 2) > 0 && flt(doc.per_billed, 2) < 100) {
 			return [__("Partly Billed"), "yellow", "per_billed,<,100|docstatus,=,1"];
-		} else if (flt(doc.grand_total) === 0 || flt(doc.per_billed, 2) === 100) {
-			return [__("Completed"), "green", "per_billed,=,100|docstatus,=,1"];
+		} else if (flt(doc.grand_total) === 0 || flt(doc.per_billed, 2) >= 100) {
+			return [__("Completed"), "green", "per_billed,>=,100|docstatus,=,1"];
 		}
 	},
 	onload: function(list_view) {