From bddebb52d661dd498ae814055ffb7a7090975675 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Tue, 26 Jun 2018 09:31:27 +0530 Subject: [PATCH 1/3] Allow only submitted Blanket Order in PO/SO --- erpnext/buying/doctype/purchase_order/purchase_order.js | 5 ++--- erpnext/selling/doctype/sales_order/sales_order.js | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 8cf56e1f89..e01dbb77e9 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -25,11 +25,10 @@ frappe.ui.form.on("Purchase Order", { frm.set_indicator_formatter('item_code', function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" }) - frm.set_query("reserve_warehouse", "supplied_items", function() { + frm.set_query("blanket_order", "items", function() { return { filters: { - "company": frm.doc.company, - "is_group": 0 + "docstatus": 1 } } }); diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index c1e790c96a..cc3b2e302f 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -32,6 +32,14 @@ frappe.ui.form.on("Sales Order", { } }); + frm.set_query("blanket_order", "items", function() { + return { + filters: { + "docstatus": 1 + } + } + }); + erpnext.queries.setup_warehouse_query(frm); }, From 0ebd0f0d62e5cef1b069656cc1cc8090375b84dc Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 26 Jun 2018 11:44:29 +0530 Subject: [PATCH 2/3] Update purchase_order.js --- erpnext/buying/doctype/purchase_order/purchase_order.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index e01dbb77e9..bc722e597e 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -28,6 +28,7 @@ frappe.ui.form.on("Purchase Order", { frm.set_query("blanket_order", "items", function() { return { filters: { + "company": frm.doc.company, "docstatus": 1 } } From 860e1690816bddbb1db1228ad427e154afa701f3 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 26 Jun 2018 11:45:04 +0530 Subject: [PATCH 3/3] Update sales_order.js --- erpnext/selling/doctype/sales_order/sales_order.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index cc3b2e302f..97c34b077c 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -35,6 +35,7 @@ frappe.ui.form.on("Sales Order", { frm.set_query("blanket_order", "items", function() { return { filters: { + "company": frm.doc.company, "docstatus": 1 } } @@ -452,4 +453,4 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( }); } }); -$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm})); \ No newline at end of file +$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));