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

fix(text): test_update_status

Browse Source
This commit is contained in:
s-aga-r 2024-01-04 15:15:55 +05:30
parent 0819675fce
commit cdd5441435
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
View File

@ -101,7 +101,7 @@ frappe.ui.form.on('Subcontracting Order', {
}, },
refresh: function (frm) { refresh: function (frm) {
if (frm.has_perm("submit")) { if (frm.doc.docstatus == 1 && frm.has_perm("submit")) {
if (frm.doc.status == "Closed") { if (frm.doc.status == "Closed") {
frm.add_custom_button(__('Re-open'), () => frm.events.update_subcontracting_order_status(frm), __("Status")); frm.add_custom_button(__('Re-open'), () => frm.events.update_subcontracting_order_status(frm), __("Status"));
} else if(flt(frm.doc.per_received, 2) < 100) { } else if(flt(frm.doc.per_received, 2) < 100) {

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

@ -283,11 +283,6 @@ class SubcontractingOrder(SubcontractingController):
status = "Completed" status = "Completed"
elif self.per_received > 0 and self.per_received < 100: elif self.per_received > 0 and self.per_received < 100:
status = "Partially Received" status = "Partially Received"
for item in self.supplied_items:
if not item.returned_qty or (item.supplied_qty - item.consumed_qty - item.returned_qty) > 0:
break
else:
status = "Closed"
else: else:
total_required_qty = total_supplied_qty = 0 total_required_qty = total_supplied_qty = 0
for item in self.supplied_items: for item in self.supplied_items:

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

@ -95,14 +95,14 @@ class TestSubcontractingOrder(FrappeTestCase):
self.assertEqual(sco.status, "Partially Received") self.assertEqual(sco.status, "Partially Received")
# Closed # Closed
ste = get_materials_from_supplier(sco.name, [d.name for d in sco.supplied_items]) sco.update_status("Closed")
ste.save()
ste.submit()
sco.load_from_db()
self.assertEqual(sco.status, "Closed") self.assertEqual(sco.status, "Closed")
ste.cancel() scr = make_subcontracting_receipt(sco.name)
sco.load_from_db() scr.save()
self.assertRaises(frappe.exceptions.ValidationError, scr.submit)
sco.update_status()
self.assertEqual(sco.status, "Partially Received") self.assertEqual(sco.status, "Partially Received")
scr.cancel()
# Completed # Completed
scr = make_subcontracting_receipt(sco.name) scr = make_subcontracting_receipt(sco.name)
@ -564,7 +564,6 @@ class TestSubcontractingOrder(FrappeTestCase):
sco.load_from_db() sco.load_from_db()
self.assertEqual(sco.status, "Closed")
self.assertEqual(sco.supplied_items[0].returned_qty, 5) self.assertEqual(sco.supplied_items[0].returned_qty, 5)
def test_ordered_qty_for_subcontracting_order(self): def test_ordered_qty_for_subcontracting_order(self):