nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-30 20:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51289 from frappe/mergify/bp/version-15-hotfix/pr-51276

Browse Source 
fix: use stock adjustment if the account has not set (backport #51276)
This commit is contained in:
rohitwaghchaure
2025-12-23 17:38:02 +05:30
committed by GitHub
parent cc1f38010d 8a01a709a7
commit 9409155594
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -1838,9 +1838,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" and not args.get("is_finished_item")) or not ret.get(
"expense_account"
):
if not ret.get("expense_account"):
ret["expense_account"] = frappe.get_cached_value(
"Company", self.company, "stock_adjustment_account"
)

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

@@ -1285,7 +1285,7 @@ class TestStockEntry(FrappeTestCase):
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[0].expense_account, "_Test Account Cost for Goods Sold - _TC")
self.assertEqual(se.items[1].expense_account, "_Test Account Cost for Goods Sold - _TC")
@change_settings("Stock Settings", {"allow_negative_stock": 0})