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

fix: wo tests, sider, account for pl in se validation

Browse Source
This commit is contained in:
18alantom 2021-08-10 14:42:39 +05:30
parent 2670adc0c0
commit cc177f3415
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/manufacturing/doctype/work_order/test_work_order.py
View File

@ -694,7 +694,7 @@ class TestWorkOrder(unittest.TestCase):
from erpnext.manufacturing.doctype.bom.test_bom import create_process_loss_bom_items from erpnext.manufacturing.doctype.bom.test_bom import create_process_loss_bom_items
from erpnext.manufacturing.doctype.bom.test_bom import create_bom_with_process_loss_item from erpnext.manufacturing.doctype.bom.test_bom import create_bom_with_process_loss_item
qty = fg_qty = 4 qty = 4
scrap_qty = 0.25 # bom item qty = 1, consider as 25% of FG scrap_qty = 0.25 # bom item qty = 1, consider as 25% of FG
source_warehouse = "Stores - _TC" source_warehouse = "Stores - _TC"
wip_warehouse = "_Test Warehouse - _TC" wip_warehouse = "_Test Warehouse - _TC"
@ -707,7 +707,7 @@ class TestWorkOrder(unittest.TestCase):
if not frappe.db.exists("BOM", bom_no): if not frappe.db.exists("BOM", bom_no):
bom_doc = create_bom_with_process_loss_item( bom_doc = create_bom_with_process_loss_item(
fg_item_non_whole, bom_item, scrap_qty=scrap_qty, fg_item_non_whole, bom_item, scrap_qty=scrap_qty,
scrap_rate=0, fg_qty=fg_qty, is_process_loss=1 scrap_rate=0, fg_qty=1, is_process_loss=1
) )
bom_doc.submit() bom_doc.submit()
@ -721,32 +721,32 @@ class TestWorkOrder(unittest.TestCase):
) )
se = frappe.get_doc( se = frappe.get_doc(
make_stock_entry(wo.name, "Material Transfer for Manufacture", 4) make_stock_entry(wo.name, "Material Transfer for Manufacture", qty)
) )
se.get("items")[0].s_warehouse = "Stores - _TC" se.get("items")[0].s_warehouse = "Stores - _TC"
se.insert() se.insert()
se.submit() se.submit()
se = frappe.get_doc( se = frappe.get_doc(
make_stock_entry(wo.name, "Manufacture", 4) make_stock_entry(wo.name, "Manufacture", qty)
) )
se.insert() se.insert()
se.submit() se.submit()
# Testing stock entry values # Testing stock entry values
items = se.get("items") items = se.get("items")
self.assertEqual(len(items), 3, "There should be 3 items including process loss.") self.assertEqual(len(items), 4, "There should be 3 items including process loss.")
source_item, fg_item, pl_item = items source_item, fg_item, pl_item = items
total_pl_qty = scrap_qty * fg_qty total_pl_qty = qty * scrap_qty
actual_fg_qty = fg_qty - total_pl_qty actual_fg_qty = qty - total_pl_qty
self.assertEqual(pl_item.qty, total_pl_qty) self.assertEqual(pl_item.qty, total_pl_qty)
self.assertEqual(fg_item.qty, actual_fg_qty) self.assertEqual(fg_item.qty, actual_fg_qty)
# Testing Work Order values # Testing Work Order values
self.assertEqual( frappe.db.get_value("Work Order", wo.name, "produced_qty"), actual_fg_qty) self.assertEqual(frappe.db.get_value("Work Order", wo.name, "produced_qty"), actual_fg_qty)
def get_scrap_item_details(bom_no): def get_scrap_item_details(bom_no):
scrap_items = {} scrap_items = {}

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -271,7 +271,7 @@ class StockEntry(StockController):
item_wise_qty = {} item_wise_qty = {}
if self.purpose == "Manufacture" and self.work_order: if self.purpose == "Manufacture" and self.work_order:
for d in self.items: for d in self.items:
if d.is_finished_item: if d.is_finished_item or d.is_process_loss:
item_wise_qty.setdefault(d.item_code, []).append(d.qty) item_wise_qty.setdefault(d.item_code, []).append(d.qty)
for item_code, qty_list in iteritems(item_wise_qty): for item_code, qty_list in iteritems(item_wise_qty):