From 4ca5e9eef8c7dbe9b99feb25a9dfea08efb26367 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sun, 30 Nov 2025 05:14:02 +0000 Subject: [PATCH] fix(stock entry): use fg item expense account for direct manufacturing entry (cherry picked from commit ce1312764fead916fa4a6a486adcc58ce97aa014) # Conflicts: # erpnext/stock/doctype/stock_entry/stock_entry.py --- erpnext/stock/doctype/stock_entry/stock_entry.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 9664ed67498..6797c2d4384 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -462,6 +462,7 @@ class StockEntry(StockController): "project": self.project, "uom": item.uom, "s_warehouse": item.s_warehouse, + "is_finished_item": item.is_finished_item, } ), for_update=True, @@ -491,6 +492,15 @@ class StockEntry(StockController): flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) ) +<<<<<<< HEAD +======= + 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")) + +>>>>>>> ce1312764f (fix(stock entry): use fg item expense account for direct manufacturing entry) def validate_fg_completed_qty(self): item_wise_qty = {} if self.purpose == "Manufacture" and self.work_order: @@ -1774,7 +1784,9 @@ class StockEntry(StockController): 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" )