Merge pull request #3434 from neilLasrado/material-request
Status Indicators fixed in Material Request List
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 894b9e1..a3026c4 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -221,7 +221,7 @@
"icon": "icon-ticket",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-05-27 15:36:06.818491",
+ "modified": "2015-06-09 05:47:05.934432",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js
index 293d960..390e222 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.js
+++ b/erpnext/stock/doctype/material_request/material_request_list.js
@@ -6,7 +6,13 @@
} else if(doc.docstatus==1 && flt(doc.per_ordered) < 100) {
return [__("Pending"), "orange", "per_ordered,<,100"];
} else if(doc.docstatus==1 && flt(doc.per_ordered) == 100) {
- return [__("Ordered"), "green", "per_ordered,=,100"];
+ if (doc.material_request_type == "Purchase") {
+ return [__("Ordered"), "green", "per_ordered,=,100"];
+ } else if (doc.material_request_type == "Material Transfer") {
+ return [__("Transfered"), "green", "per_ordered,=,100"];
+ } else if (doc.material_request_type == "Material Issue") {
+ return [__("Issued"), "green", "per_ordered,=,100"];
+ }
}
}
};