CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 14:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Default company bank account

Browse Source
This commit is contained in:
Deepesh Garg
2024-03-31 19:48:40 +05:30
parent 8e522183bc
commit 7ac91deb83
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/bank_account/bank_account.py
View File

@@ -115,6 +115,10 @@ def get_party_bank_account(party_type, party):
return frappe.db.get_value(party_type, party, "default_bank_account")
def get_default_company_bank_account(company):
return frappe.db.get_value("Bank Account", {"company": company, "is_company_account": 1, "is_default": 1})
@frappe.whitelist()
def get_bank_account_details(bank_account):
return frappe.get_cached_value(

3
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@@ -470,6 +470,9 @@ frappe.ui.form.on("Payment Entry", {
() => frm.events.set_dynamic_labels(frm),
() => {
frm.set_party_account_based_on_party = false;
if (r.message.party_bank_account) {
frm.set_value("party_bank_account", r.message.party_bank_account);
}
if (r.message.bank_account) {
frm.set_value("bank_account", r.message.bank_account);
}

6
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -16,6 +16,7 @@ import erpnext
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions
from erpnext.accounts.doctype.bank_account.bank_account import (
get_bank_account_details,
get_default_company_bank_account,
get_party_bank_account,
)
from erpnext.accounts.doctype.invoice_discounting.invoice_discounting import (
@@ -2109,7 +2110,9 @@ def get_party_details(company, party_type, party, date, cost_center=None):
party_name = frappe.db.get_value(party_type, party, _party_name)
party_balance = get_balance_on(party_type=party_type, party=party, cost_center=cost_center)
if party_type in ["Customer", "Supplier"]:
bank_account = get_party_bank_account(party_type, party)
party_bank_account = get_party_bank_account(party_type, party)
bank_account = get_default_company_bank_account(company)
return {
"party_account": party_account,
@@ -2117,6 +2120,7 @@ def get_party_details(company, party_type, party, date, cost_center=None):
"party_account_currency": account_currency,
"party_balance": party_balance,
"account_balance": account_balance,
"party_bank_account": party_bank_account,
"bank_account": bank_account,
}