From 22e5aba02bc09eee27573f52b12439341dc9eff4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 8 Jan 2026 14:45:39 +0530 Subject: [PATCH] chore: fix conflicts Refactor test cases for delivery notes to handle negative stock and higher precision. (cherry picked from commit 5193dbba9b630daf53fdefe92d4a5dac783dda91) --- erpnext/stock/doctype/delivery_note/test_delivery_note.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 4e0cebc3f3d..22bc81194ec 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -2051,7 +2051,6 @@ class TestDeliveryNote(FrappeTestCase): serial_batch_map[row.item_code].batch_no_valuation[entry.batch_no], ) -<<<<<<< HEAD @change_settings("Stock Settings", {"allow_negative_stock": 0, "enable_stock_reservation": 1}) def test_partial_delivery_note_against_reserved_stock(self): from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import ( @@ -2120,7 +2119,7 @@ class TestDeliveryNote(FrappeTestCase): self.assertEqual(sre_details[0].status, "Partially Delivered") self.assertEqual(sre_details[0].reserved_qty, so.items[0].qty) self.assertEqual(sre_details[0].delivered_qty, dn.items[0].qty) -======= + def test_negative_stock_with_higher_precision(self): original_flt_precision = frappe.db.get_default("float_precision") frappe.db.set_single_value("System Settings", "float_precision", 7) @@ -2137,7 +2136,6 @@ class TestDeliveryNote(FrappeTestCase): self.assertRaises(frappe.ValidationError, dn.submit) frappe.db.set_single_value("System Settings", "float_precision", original_flt_precision) ->>>>>>> 87be020c78 (fix: negative stock issue for higher precision) >>>>>>> 1bbeecff12 (fix: negative stock issue for higher precision)