From a7161d387554798185e4e00dfb64700ad94345ad Mon Sep 17 00:00:00 2001 From: Sagar Sharma Date: Tue, 5 Jul 2022 09:15:28 +0530 Subject: [PATCH] fix: SCO status on SCR cancel --- .../doctype/subcontracting_order/subcontracting_order.py | 3 ++- .../subcontracting_order/test_subcontracting_order.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py index 73ab43401b..71cdc94a3a 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py @@ -192,10 +192,11 @@ class SubcontractingOrder(SubcontractingController): status = "Partial Material Transferred" if total_supplied_qty >= total_required_qty: status = "Material Transferred" + else: + status = "Open" elif self.docstatus == 2: status = "Cancelled" - if status: frappe.db.set_value("Subcontracting Order", self.name, "status", status, update_modified) diff --git a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py index e579834963..94bb38e980 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py @@ -96,6 +96,12 @@ class TestSubcontractingOrder(FrappeTestCase): sco.load_from_db() self.assertEqual(sco.status, "Completed") + # Partially Received (scr cancelled) + scr.load_from_db() + scr.cancel() + sco.load_from_db() + self.assertEqual(sco.status, "Partially Received") + def test_make_rm_stock_entry(self): sco = get_subcontracting_order() rm_items = get_rm_items(sco.supplied_items)