From 873c579bb41523cc6baf7ebe2d842c012ff88844 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Tue, 12 Mar 2019 13:39:01 +0530 Subject: [PATCH] fix: check for both hold and closed status in po --- erpnext/buying/doctype/purchase_order/purchase_order.py | 2 +- erpnext/stock/doctype/material_request/material_request.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index bbe812829d3..a63fe26117f 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -232,7 +232,7 @@ class PurchaseOrder(BuyingController): if self.is_subcontracted == "Yes": self.update_reserved_qty_for_subcontract() - self.check_for_closed_status() + self.check_on_hold_or_closed_status() frappe.db.set(self,'status','Cancelled') diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 7a199a4e1ed..fc01ec7cbac 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -13,7 +13,7 @@ from frappe.model.mapper import get_mapped_doc from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty from erpnext.controllers.buying_controller import BuyingController from erpnext.manufacturing.doctype.work_order.work_order import get_item_details -from erpnext.buying.utils import check_for_closed_status, validate_for_items +from erpnext.buying.utils import check_on_hold_or_closed_status, validate_for_items from erpnext.stock.doctype.item.item import get_item_defaults from six import string_types @@ -100,7 +100,7 @@ class MaterialRequest(BuyingController): def before_cancel(self): # if MRQ is already closed, no point saving the document - check_for_closed_status(self.doctype, self.name) + check_on_hold_or_closed_status(self.doctype, self.name) self.set_status(update=True, status='Cancelled') def check_modified_date(self):