mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 16:04:46 +00:00
fix(material-request): update customer provided status
This commit is contained in:
@@ -130,7 +130,7 @@ status_map = {
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Received",
|
"Received",
|
||||||
"eval:self.status != 'Stopped' and self.per_received == 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'",
|
"eval:self.status != 'Stopped' and self.docstatus == 1 and ((self.per_received == 100 and self.material_request_type == 'Purchase') or (self.per_ordered == 100 and self.material_request_type == 'Customer Provided'))",
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Partially Received",
|
"Partially Received",
|
||||||
@@ -138,11 +138,11 @@ status_map = {
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Partially Received",
|
"Partially Received",
|
||||||
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1 and self.material_request_type == 'Material Transfer'",
|
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1 and self.material_request_type in ['Material Transfer', 'Customer Provided']",
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Partially Ordered",
|
"Partially Ordered",
|
||||||
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1 and self.material_request_type != 'Material Transfer'",
|
"eval:self.status != 'Stopped' and self.per_ordered < 100 and self.per_ordered > 0 and self.docstatus == 1 and self.material_request_type not in ['Material Transfer', 'Customer Provided']",
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"POS Opening Entry": [
|
"POS Opening Entry": [
|
||||||
|
|||||||
@@ -21,7 +21,8 @@ frappe.listview_settings["Material Request"] = {
|
|||||||
} else if (
|
} else if (
|
||||||
doc.docstatus == 1 &&
|
doc.docstatus == 1 &&
|
||||||
flt(doc.per_ordered, precision) < 100 &&
|
flt(doc.per_ordered, precision) < 100 &&
|
||||||
doc.material_request_type == "Material Transfer"
|
(doc.material_request_type == "Material Transfer" ||
|
||||||
|
doc.material_request_type == "Customer Provided")
|
||||||
) {
|
) {
|
||||||
return [__("Partially Received"), "yellow", "per_ordered,<,100"];
|
return [__("Partially Received"), "yellow", "per_ordered,<,100"];
|
||||||
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) < 100) {
|
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) < 100) {
|
||||||
|
|||||||
Reference in New Issue
Block a user