diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 2da0f0381b4..d8c50b2622f 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -90,7 +90,8 @@ status_map = { ["Transferred", "eval:self.status != 'Stopped' and self.per_ordered == 100 and self.docstatus == 1 and self.material_request_type == 'Material Transfer'"], ["Issued", "eval:self.status != 'Stopped' and self.per_ordered == 100 and self.docstatus == 1 and self.material_request_type == 'Material Issue'"], ["Received", "eval:self.status != 'Stopped' and self.per_received == 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'"], - ["Partially Received", "eval:self.status != 'Stopped' and self.per_received > 0 and self.per_received < 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'"] + ["Partially Received", "eval:self.status != 'Stopped' and self.per_received > 0 and self.per_received < 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'"], + ["Manufactured", "eval:self.status != 'Stopped' and self.per_ordered == 100 and self.docstatus == 1 and self.material_request_type == 'Manufacture'"] ], "Bank Transaction": [ ["Unreconciled", "eval:self.docstatus == 1 and self.unallocated_amount>0"], diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 078a61d3f6e..398c6020a05 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -624,3 +624,4 @@ erpnext.patches.v11_1.update_default_supplier_in_item_defaults erpnext.patches.v12_0.update_due_date_in_gle erpnext.patches.v12_0.add_default_buying_selling_terms_in_company erpnext.patches.v12_0.update_ewaybill_field_position +erpnext.patches.v11_1.set_status_for_material_request_type_manufacture diff --git a/erpnext/patches/v11_1/set_status_for_material_request_type_manufacture.py b/erpnext/patches/v11_1/set_status_for_material_request_type_manufacture.py new file mode 100644 index 00000000000..d41cff523d5 --- /dev/null +++ b/erpnext/patches/v11_1/set_status_for_material_request_type_manufacture.py @@ -0,0 +1,9 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.db.sql(""" + update `tabMaterial Request` + set status='Manufactured' + where docstatus=1 and material_request_type='Manufacture' and per_ordered=100 and status != 'Stopped' + """) \ No newline at end of file diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js index 1cf971ff449..614ecb8a8f9 100644 --- a/erpnext/stock/doctype/material_request/material_request_list.js +++ b/erpnext/stock/doctype/material_request/material_request_list.js @@ -20,6 +20,8 @@ frappe.listview_settings['Material Request'] = { return [__("Issued"), "green", "per_ordered,=,100"]; } else if (doc.material_request_type == "Customer Provided") { return [__("Received"), "green", "per_ordered,=,100"]; + } else if (doc.material_request_type == "Manufacture") { + return [__("Manufactured"), "green", "per_ordered,=,100"]; } } }