Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25063 from ankush/mr_stopped_validation

Browse Source 
fix: do not fetch stopped MR in production plan
This commit is contained in:
Marica 2021-03-31 20:10:54 +05:30 committed by GitHub
commit 7d3eda47b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@ -25,6 +25,16 @@ frappe.ui.form.on('Production Plan', {
} }
}); });
frm.set_query('material_request', 'material_requests', function() {
return {
filters: {
material_request_type: "Manufacture",
docstatus: 1,
status: ["!=", "Stopped"],
}
};
});
frm.fields_dict['po_items'].grid.get_field('item_code').get_query = function(doc) { frm.fields_dict['po_items'].grid.get_field('item_code').get_query = function(doc) {
return { return {
query: "erpnext.controllers.queries.item_query", query: "erpnext.controllers.queries.item_query",

2
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@ -70,7 +70,7 @@ class ProductionPlan(Document):
from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
where mr_item.parent = mr.name where mr_item.parent = mr.name
and mr.material_request_type = "Manufacture" and mr.material_request_type = "Manufacture"
and mr.docstatus = 1 and mr.company = %(company)s and mr.docstatus = 1 and mr.status != "Stopped" and mr.company = %(company)s
and mr_item.qty > ifnull(mr_item.ordered_qty,0) {0} {1} and mr_item.qty > ifnull(mr_item.ordered_qty,0) {0} {1}
and (exists (select name from `tabBOM` bom where bom.item=mr_item.item_code and (exists (select name from `tabBOM` bom where bom.item=mr_item.item_code
and bom.is_active = 1)) and bom.is_active = 1))