Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: SCO status on SCR cancel

Browse Source
This commit is contained in:
Sagar Sharma 2022-07-05 09:15:28 +05:30
parent 6f7e67db9d
commit a7161d3875
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
View File

@ -192,10 +192,11 @@ class SubcontractingOrder(SubcontractingController):
status = "Partial Material Transferred" status = "Partial Material Transferred"
if total_supplied_qty >= total_required_qty: if total_supplied_qty >= total_required_qty:
status = "Material Transferred" status = "Material Transferred"
else:
status = "Open"
elif self.docstatus == 2: elif self.docstatus == 2:
status = "Cancelled" status = "Cancelled"
if status:
frappe.db.set_value("Subcontracting Order", self.name, "status", status, update_modified) frappe.db.set_value("Subcontracting Order", self.name, "status", status, update_modified)

6
erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
View File

@ -96,6 +96,12 @@ class TestSubcontractingOrder(FrappeTestCase):
sco.load_from_db() sco.load_from_db()
self.assertEqual(sco.status, "Completed") 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): def test_make_rm_stock_entry(self):
sco = get_subcontracting_order() sco = get_subcontracting_order()
rm_items = get_rm_items(sco.supplied_items) rm_items = get_rm_items(sco.supplied_items)