nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-12-02 17:44:17 +05:30
committed by GitHub
parent b2ea5620b2
commit b1b6953aed
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -1285,14 +1285,10 @@ class TestStockEntry(FrappeTestCase):
self.assertEqual(se.value_difference, 0.0) self.assertEqual(se.value_difference, 0.0)
self.assertEqual(se.total_incoming_value, se.total_outgoing_value) 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[0].expense_account, "Stock Adjustment - _TC")
self.assertEqual(se.items[1].expense_account, "_Test Account Cost for Goods Sold - _TC") self.assertEqual(se.items[1].expense_account, "_Test Account Cost for Goods Sold - _TC")
@IntegrationTestCase.change_settings("Stock Settings", {"allow_negative_stock": 0}) @change_settings("Stock Settings", {"allow_negative_stock": 0})
>>>>>>> ba2411b4ee (test: add test for fg item expense account in direct manufacturing)
def test_future_negative_sle(self): def test_future_negative_sle(self):
# Initialize item, batch, warehouse, opening qty # Initialize item, batch, warehouse, opening qty
item_code = "_Test Future Neg Item" item_code = "_Test Future Neg Item"