diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 09f8e1f30ad6622a55a50ef9f9e2493c2373ad90..040bcc240d30098c35c8531f43b8ee771706b355 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -111,7 +111,7 @@ status_map = { ["Return Issued", "eval:self.per_returned == 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)", + "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 a170c8ec204e68e74598bfd1c69a7f66d4a622cc..6d1cba07c53843d33f83ef6aaba7ef6dd8648357 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js @@ -21,8 +21,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) {