From 62f342ef8b09abe821fbe8deebbd68054ee7fd85 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 25 Mar 2025 13:41:27 +0530 Subject: [PATCH] fix: expense account in the stock entry (cherry picked from commit 89569d4b324b0af109efdc3776f450ddc9a1fd61) --- erpnext/stock/doctype/stock_entry/stock_entry.js | 6 ------ erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 635fd1a1fcf..0c619b22a33 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1026,10 +1026,6 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle }; }); - if (me.frm.doc.company && erpnext.is_perpetual_inventory_enabled(me.frm.doc.company)) { - this.frm.add_fetch("company", "stock_adjustment_account", "expense_account"); - } - this.frm.fields_dict.items.grid.get_field("expense_account").get_query = function () { if (erpnext.is_perpetual_inventory_enabled(me.frm.doc.company)) { return { @@ -1143,8 +1139,6 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle this.frm.trigger("toggle_display_account_head"); erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype); - if (this.frm.doc.company && erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) - this.set_default_account("stock_adjustment_account", "expense_account"); this.set_default_account("cost_center", "cost_center"); this.frm.refresh_fields("items"); diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 3f548a1324d..52655c9ac03 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -1672,7 +1672,7 @@ 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": + if self.purpose == "Manufacture" or not ret.get("expense_account"): ret["expense_account"] = frappe.get_cached_value( "Company", self.company, "stock_adjustment_account" )