CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 16:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: list view and form status not same for purchase order (backport #43690) (#43692)

Browse Source 
* fix: list view and form status not same for purchase order (#43690)

(cherry picked from commit a671fe13d4)

# 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 <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-10-16 14:57:57 +05:30
committed by GitHub
parent cd9f949b12
commit a33d5535a7
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -382,7 +382,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
} }
if (doc.status != "Closed") { if (doc.status != "Closed") {
if (doc.status != "On Hold") { 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( cur_frm.add_custom_button(
__("Purchase Receipt"), __("Purchase Receipt"),
this.make_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( cur_frm.add_custom_button(
__("Purchase Invoice"), __("Purchase Invoice"),
this.make_purchase_invoice, this.make_purchase_invoice,

17
erpnext/buying/doctype/purchase_order/purchase_order_list.js
View File

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