From 0fb5f75e9345b4117ddaad1aae817b4738540c8d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 30 Sep 2025 18:43:38 +0530 Subject: [PATCH] chore: fix conflicts Removed the test for additional material transfer in work orders. --- .../doctype/work_order/test_work_order.py | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index 6716e0855e9..0b9dc3348fe 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -2828,38 +2828,6 @@ class TestWorkOrder(FrappeTestCase): wo.operations[3].planned_start_time, add_to_date(wo.operations[1].planned_end_time, minutes=10) ) -<<<<<<< HEAD -======= - def test_allow_additional_material_transfer(self): - from erpnext.stock.doctype.stock_entry.test_stock_entry import ( - make_stock_entry as make_stock_entry_test_record, - ) - - frappe.db.set_single_value("Manufacturing Settings", "transfer_extra_materials_percentage", 50) - wo_order = make_wo_order_test_record(planned_start_date=now(), qty=2) - for row in wo_order.required_items: - make_stock_entry_test_record( - item_code=row.item_code, - target=row.source_warehouse, - qty=row.required_qty * 2, - basic_rate=100, - ) - - stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Material Transfer for Manufacture", 2)) - stock_entry.insert() - stock_entry.submit() - - wo_order.reload() - self.assertEqual(wo_order.material_transferred_for_manufacturing, 2) - - stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Material Transfer for Manufacture", 1)) - stock_entry.insert() - stock_entry.submit() - - wo_order.reload() - self.assertEqual(wo_order.material_transferred_for_manufacturing, 3) - frappe.db.set_single_value("Manufacturing Settings", "transfer_extra_materials_percentage", 0) - def test_req_qty_clamping_in_manufacture_entry(self): from erpnext.stock.doctype.stock_entry.test_stock_entry import ( make_stock_entry as make_stock_entry_test_record, @@ -2932,7 +2900,6 @@ class TestWorkOrder(FrappeTestCase): self.assertLessEqual(row.qty, 20) self.assertGreaterEqual(row.qty, 0) ->>>>>>> 34d2c8d9c2 (test: required_qty clamping in manufacture entry) def make_stock_in_entries_and_get_batches(rm_item, source_warehouse, wip_warehouse): from erpnext.stock.doctype.stock_entry.test_stock_entry import (