From 4553d04c3884213965942e5be9f20ad8b4e2ce3c Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sun, 30 Nov 2025 05:17:17 +0000 Subject: [PATCH] test: add test for fg item expense account in direct manufacturing (cherry picked from commit ba2411b4ee6f0b2b7abc546fde6baa791e178171) # Conflicts: # erpnext/stock/doctype/stock_entry/test_stock_entry.py --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index cde5be4d6ee..966844e26ff 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -1267,6 +1267,7 @@ class TestStockEntry(FrappeTestCase): frappe._dict(item_code="_Test FG Item", qty=4, t_warehouse="_Test Warehouse 1 - _TC"), ], ) + frappe.db.set_value("Company", "_Test Company", "stock_adjustment_account", "Stock Adjustment - _TC") # SE must have atleast one FG self.assertRaises(FinishedGoodError, se.save) @@ -1284,7 +1285,14 @@ 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) def test_future_negative_sle(self): # Initialize item, batch, warehouse, opening qty item_code = "_Test Future Neg Item"