From ce1312764fead916fa4a6a486adcc58ce97aa014 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sun, 30 Nov 2025 05:14:02 +0000 Subject: [PATCH 1/2] fix(stock entry): use fg item expense account for direct manufacturing entry --- erpnext/stock/doctype/stock_entry/stock_entry.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 5f83b926510..67016b81f3e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -577,6 +577,7 @@ class StockEntry(StockController, SubcontractingInwardController): "project": self.project, "uom": item.uom, "s_warehouse": item.s_warehouse, + "is_finished_item": item.is_finished_item, } ), for_update=True, @@ -609,6 +610,9 @@ class StockEntry(StockController, SubcontractingInwardController): if self.purpose == "Subcontracting Delivery": item.expense_account = frappe.get_value("Company", self.company, "default_expense_account") + if self.purpose == "Manufacture": + item.set("expense_account", item_details.get("expense_account")) + def validate_fg_completed_qty(self): if self.purpose != "Manufacture": return @@ -2078,7 +2082,9 @@ class StockEntry(StockController, SubcontractingInwardController): if self.purpose == "Material Issue": ret["expense_account"] = item.get("expense_account") or item_group_defaults.get("expense_account") - if self.purpose == "Manufacture" or not ret.get("expense_account"): + if (self.purpose == "Manufacture" and not args.get("is_finished_item")) or not ret.get( + "expense_account" + ): ret["expense_account"] = frappe.get_cached_value( "Company", self.company, "stock_adjustment_account" ) From ba2411b4ee6f0b2b7abc546fde6baa791e178171 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sun, 30 Nov 2025 05:17:17 +0000 Subject: [PATCH 2/2] test: add test for fg item expense account in direct manufacturing --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 98205a7d8f3..5db69098f3c 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -1261,6 +1261,7 @@ class TestStockEntry(IntegrationTestCase): 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) @@ -1278,6 +1279,9 @@ class TestStockEntry(IntegrationTestCase): self.assertEqual(se.value_difference, 0.0) self.assertEqual(se.total_incoming_value, se.total_outgoing_value) + 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}) def test_future_negative_sle(self): # Initialize item, batch, warehouse, opening qty