From 86e650c1edf2fa28baa68fd175d3e128c93a4189 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Sat, 2 Mar 2019 20:30:21 +0530 Subject: [PATCH] feat: validate linked sales order on material request creation --- erpnext/controllers/selling_controller.py | 2 +- erpnext/stock/doctype/material_request/material_request.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 95578cb38d0..ea18004a8f1 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -261,7 +261,7 @@ class SellingController(StockController): for d in self.get("items"): if d.get(ref_fieldname): status = frappe.db.get_value("Sales Order", d.get(ref_fieldname), "status") - if status == "Closed" or status == "On Hold": + if status in ("Closed", "On Hold"): frappe.throw(_("Sales Order {0} is {1}").format(d.get(ref_fieldname), status)) def update_reserved_qty(self): diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index f0723b6920b..2735f370a0b 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -128,7 +128,7 @@ frappe.ui.form.on('Material Request', { }, get_query_filters: { docstatus: 1, - status: ["!=", "Closed"], + status: ["not in", ["Closed", "On Hold"]], per_delivered: ["<", 99.99], } });