CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-24 05:32:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: get stock accounts from the doc instead of db in validate_stock_accounts

Browse Source 
(cherry picked from commit 30954586d8)
This commit is contained in:
Vishakh Desai
2024-10-01 12:25:04 +05:30
committed by Mergify
parent 29fe23bc0a
commit 39387e9f54
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -259,7 +259,7 @@ class JournalEntry(AccountsController):
frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation")) frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
def validate_stock_accounts(self): def validate_stock_accounts(self):
stock_accounts = get_stock_accounts(self.company, self.doctype, self.name) stock_accounts = get_stock_accounts(self.company, accounts=self.accounts)
for account in stock_accounts: for account in stock_accounts:
account_bal, stock_bal, warehouse_list = get_stock_and_account_balance( account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(
account, self.posting_date, self.company account, self.posting_date, self.company

8
erpnext/accounts/utils.py
View File

@@ -1547,12 +1547,16 @@ def compare_existing_and_expected_gle(existing_gle, expected_gle, precision):
return matched return matched
def get_stock_accounts(company, voucher_type=None, voucher_no=None): def get_stock_accounts(company, voucher_type=None, voucher_no=None, accounts=None):
stock_accounts = [ stock_accounts = [
d.name d.name
for d in frappe.db.get_all("Account", {"account_type": "Stock", "company": company, "is_group": 0}) for d in frappe.db.get_all("Account", {"account_type": "Stock", "company": company, "is_group": 0})
] ]
if voucher_type and voucher_no:
if accounts:
stock_accounts = [row.account for row in accounts if row.account in stock_accounts]
elif voucher_type and voucher_no:
if voucher_type == "Journal Entry": if voucher_type == "Journal Entry":
stock_accounts = [ stock_accounts = [
d.account d.account