fix: list view and form status not same for purchase order (backport #…

…43690) (#43692) * fix: list view and form status not same for purchase order (#43690) (cherry picked from commit a671fe1) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.js # erpnext/buying/doctype/purchase_order/purchase_order_list.js * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <[email protected]>
frappe · Oct 16, 2024 · a33d553 · a33d553
1 parent cd9f949
commit a33d553
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -382,7 +382,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
 			}
 			if (doc.status != "Closed") {
 				if (doc.status != "On Hold") {
-					if (flt(doc.per_received, 2) < 100 && allow_receipt) {
+					if (flt(doc.per_received) < 100 && allow_receipt) {
 						cur_frm.add_custom_button(
 							__("Purchase Receipt"),
 							this.make_purchase_receipt,
@@ -408,7 +408,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
 							}
 						}
 					}
-					if (flt(doc.per_billed, 2) < 100)
+					if (flt(doc.per_billed) < 100)
 						cur_frm.add_custom_button(
 							__("Purchase Invoice"),
 							this.make_purchase_invoice,

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -10,14 +10,15 @@ frappe.listview_settings["Purchase Order"] = {
 		"status",
 	],
 	get_indicator: function (doc) {
+		// Please do not add precision in the flt function
 		if (doc.status === "Closed") {
 			return [__("Closed"), "green", "status,=,Closed"];
 		} else if (doc.status === "On Hold") {
 			return [__("On Hold"), "orange", "status,=,On Hold"];
 		} else if (doc.status === "Delivered") {
 			return [__("Delivered"), "green", "status,=,Closed"];
-		} else if (flt(doc.per_received, 2) < 100 && doc.status !== "Closed") {
-			if (flt(doc.per_billed, 2) < 100) {
+		} else if (flt(doc.per_received) < 100 && doc.status !== "Closed") {
+			if (flt(doc.per_billed) < 100) {
 				return [
 					__("To Receive and Bill"),
 					"orange",
@@ -26,17 +27,9 @@ frappe.listview_settings["Purchase Order"] = {
 			} else {
 				return [__("To Receive"), "orange", "per_received,<,100|per_billed,=,100|status,!=,Closed"];
 			}
-		} else if (
-			flt(doc.per_received, 2) >= 100 &&
-			flt(doc.per_billed, 2) < 100 &&
-			doc.status !== "Closed"
-		) {
+		} else if (flt(doc.per_received) >= 100 && flt(doc.per_billed) < 100 && doc.status !== "Closed") {
 			return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Closed"];
-		} else if (
-			flt(doc.per_received, 2) >= 100 &&
-			flt(doc.per_billed, 2) == 100 &&
-			doc.status !== "Closed"
-		) {
+		} else if (flt(doc.per_received) >= 100 && flt(doc.per_billed) == 100 && doc.status !== "Closed") {
 			return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Closed"];
 		}
 	},