nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51276 from rohitwaghchaure/fixed-expense-account-stock-entry

Browse Source 
fix: use stock adjustment if the account has not set
This commit is contained in:
rohitwaghchaure
2025-12-23 17:07:43 +05:30
committed by GitHub
parent 250b9755f2 9bbcbe0ac3
commit 2873dab98e
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

@@ -2091,9 +2091,7 @@ class StockEntry(StockController, SubcontractingInwardController):
if self.purpose == "Material Issue": if self.purpose == "Material Issue":
ret["expense_account"] = item.get("expense_account") or item_group_defaults.get("expense_account") 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( if not ret.get("expense_account"):
"expense_account"
):
ret["expense_account"] = frappe.get_cached_value( ret["expense_account"] = frappe.get_cached_value(
"Company", self.company, "stock_adjustment_account" "Company", self.company, "stock_adjustment_account"
) )

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

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