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

Merge pull request #25110 from ankush/mr_stopped_validation_v12

Browse Source 
fix: do not fetch stopped MR in production plan
This commit is contained in:
Marica
2021-04-02 13:16:13 +05:30
committed by GitHub
parent 883598890d 35c4a7a05d
commit 9cc129c400
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,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) {
return {
query: "erpnext.controllers.queries.item_query",

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

@@ -68,7 +68,7 @@ class ProductionPlan(Document):
from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
where mr_item.parent = mr.name
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 (exists (select name from `tabBOM` bom where bom.item=mr_item.item_code
and bom.is_active = 1))