From b1b6953aed18e8a2f4edfdb047d04eb52c33c12d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 2 Dec 2025 17:44:17 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 966844e26ff..aa5f0ae1045 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -1285,14 +1285,10 @@ class TestStockEntry(FrappeTestCase): self.assertEqual(se.value_difference, 0.0) self.assertEqual(se.total_incoming_value, se.total_outgoing_value) -<<<<<<< HEAD - @change_settings("Stock Settings", {"allow_negative_stock": 0}) -======= self.assertEqual(se.items[0].expense_account, "Stock Adjustment - _TC") self.assertEqual(se.items[1].expense_account, "_Test Account Cost for Goods Sold - _TC") - @IntegrationTestCase.change_settings("Stock Settings", {"allow_negative_stock": 0}) ->>>>>>> ba2411b4ee (test: add test for fg item expense account in direct manufacturing) + @change_settings("Stock Settings", {"allow_negative_stock": 0}) def test_future_negative_sle(self): # Initialize item, batch, warehouse, opening qty item_code = "_Test Future Neg Item"