From 1c6fe9da3bb7b55c9042bcb95c8c47c1aad62acd Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 14 Jan 2025 18:36:27 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/delivery_note/test_delivery_note.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index a0d2bce1647..4afaffe6fd4 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -2406,12 +2406,6 @@ class TestDeliveryNote(FrappeTestCase): if row.item_code == serial_item.name: self.assertTrue(row.serial_no) -<<<<<<< HEAD -======= - if row.item_code == batch_serial_item.name: - self.assertTrue(row.batch_no) - self.assertTrue(row.serial_no) - def test_delivery_note_return_for_batch_item_with_different_warehouse(self): from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse @@ -2482,7 +2476,6 @@ class TestDeliveryNote(FrappeTestCase): for d in bundle_data: self.assertEqual(d.incoming_rate, batch_no_valuation[d.batch_no]) ->>>>>>> 3a2e816759 (fix: incorrect valuation for sales return with different warhouse) def create_delivery_note(**args): dn = frappe.new_doc("Delivery Note")