From 8bccc25b1ad9d6fb9dd0739bad258f3230b3d233 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 8 Jun 2026 19:45:39 +0530 Subject: [PATCH] chore: fix conflicts Removed unused test cases related to sample retention stock entry. --- .../doctype/stock_entry/test_stock_entry.py | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 19b435f8481..870091932b6 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -2244,8 +2244,6 @@ class TestStockEntry(FrappeTestCase): se.save() se.submit() -<<<<<<< HEAD -======= def test_disassemble_blocks_finished_good_qty_tampering(self): # A disassembly consuming N finished goods must consume exactly N (in stock UOM). # Switching the finished-good row to a larger UOM with a tiny conversion_factor previously @@ -2287,48 +2285,6 @@ class TestStockEntry(FrappeTestCase): self.assertRaises(frappe.ValidationError, se.save) - @ERPNextTestSuite.change_settings( - "Stock Settings", {"sample_retention_warehouse": "_Test Warehouse 1 - _TC"} - ) - def test_sample_retention_stock_entry(self): - from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse - - warehouse = "_Test Warehouse - _TC" - retain_sample_item = make_item( - "Retain Sample Item", - properties={ - "is_stock_item": 1, - "retain_sample": 1, - "sample_quantity": 2, - "has_batch_no": 1, - "has_serial_no": 1, - "create_new_batch": 1, - "batch_number_series": "SAMPLE-RET-.#####", - "serial_no_series": "SAMPLE-RET-SN-.#####", - }, - ) - material_receipt = make_stock_entry( - item_code=retain_sample_item.item_code, target=warehouse, qty=10, purpose="Material Receipt" - ) - - source_sabb = frappe.get_doc( - "Serial and Batch Bundle", material_receipt.items[0].serial_and_batch_bundle - ) - batch = source_sabb.entries[0].batch_no - serial_nos = [entry.serial_no for entry in source_sabb.entries] - - sample_entry = frappe.get_doc( - move_sample_to_retention_warehouse(material_receipt.company, material_receipt.items) - ) - sample_entry.submit() - target_sabb = frappe.get_doc("Serial and Batch Bundle", sample_entry.items[0].serial_and_batch_bundle) - - self.assertEqual(sample_entry.items[0].transfer_qty, 2) - self.assertEqual(target_sabb.entries[0].batch_no, batch) - self.assertEqual([entry.serial_no for entry in target_sabb.entries], serial_nos[:2]) - - @ERPNextTestSuite.change_settings("Manufacturing Settings", {"material_consumption": 0}) ->>>>>>> 4453c1072a (fix: validate fg and materials qty in the disassemble entry) def test_raw_material_missing_validation(self): original_value = frappe.db.get_single_value("Manufacturing Settings", "material_consumption") frappe.db.set_single_value("Manufacturing Settings", "material_consumption", 0)