nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-04-09 09:06:31 +05:30
committed by GitHub
parent 8408e81335
commit c70259687a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -509,9 +509,6 @@ class TestWorkOrder(FrappeTestCase):
def test_work_order_material_transferred_qty_with_process_loss(self): def test_work_order_material_transferred_qty_with_process_loss(self):
stock_entries = [] stock_entries = []
<<<<<<< HEAD
bom = frappe.get_doc("BOM", {"docstatus": 1, "with_operations": 1, "company": "_Test Company"})
=======
item_code = make_item("_Test Item For Process Loss", {"is_stock_item": 1}).name item_code = make_item("_Test Item For Process Loss", {"is_stock_item": 1}).name
rm_item_code = make_item("Test Item For Process Loss RM", {"is_stock_item": 1}).name rm_item_code = make_item("Test Item For Process Loss RM", {"is_stock_item": 1}).name
@@ -547,7 +544,6 @@ class TestWorkOrder(FrappeTestCase):
bom.append("operations", operation) bom.append("operations", operation)
bom.save() bom.save()
bom.submit() bom.submit()
>>>>>>> 38ed425ee2 (fix: last SLE not updated in the file)
work_order = make_wo_order_test_record( work_order = make_wo_order_test_record(
item=bom.item, item=bom.item,