From 43d32eb10ec7b475dd8edbe667de489be986d069 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 17 Feb 2025 21:32:48 +0530 Subject: [PATCH] chore: fix conflicts --- .../test_serial_and_batch_bundle.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py index 8748f8a785f..a3bd20b80ba 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py @@ -16,19 +16,7 @@ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle impor from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry -<<<<<<< HEAD class TestSerialandBatchBundle(FrappeTestCase): -======= -class UnitTestSerialAndBatchBundle(UnitTestCase): - """ - Unit tests for SerialAndBatchBundle. - Use this class for testing individual functions and methods. - """ - - pass - - -class TestSerialandBatchBundle(IntegrationTestCase): def test_naming_for_sabb(self): frappe.db.set_single_value( "Stock Settings", "set_serial_and_batch_bundle_naming_based_on_naming_series", 1 @@ -90,7 +78,6 @@ class TestSerialandBatchBundle(IntegrationTestCase): self.assertFalse(bundle_doc.name.startswith("SABB-")) ->>>>>>> fe43975cdd (fix: provision to enable naming series for SABB) def test_inward_outward_serial_valuation(self): from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt