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

fix: Get default party bank account and company bank account for a party

Browse Source 
(cherry picked from commit f87be1d96e)
This commit is contained in:
Nabin Hait
2024-04-04 16:54:42 +05:30
committed by Mergify
parent 959d9c5fda
commit 174567350e
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ class BankAccount(Document):
self.validate_company() self.validate_company()
self.validate_iban() self.validate_iban()
self.validate_account() self.validate_account()
self.update_default_bank_account()
def validate_account(self): def validate_account(self):
if self.account: if self.account:
@@ -100,23 +101,51 @@ class BankAccount(Document):
if to_check % 97 != 1: if to_check % 97 != 1:
frappe.throw(_("IBAN is not valid")) frappe.throw(_("IBAN is not valid"))
def update_default_bank_account(self):
if self.is_default and not self.disabled:
frappe.db.set_value(
"Bank Account",
{
"party_type": self.party_type,
"party": self.party,
"is_company_account": self.is_company_account,
"is_default": 1,
"disabled": 0,
},
"is_default",
0,
)
@frappe.whitelist() @frappe.whitelist()
def make_bank_account(doctype, docname): def make_bank_account(doctype, docname):
doc = frappe.new_doc("Bank Account") doc = frappe.new_doc("Bank Account")
doc.party_type = doctype doc.party_type = doctype
doc.party = docname doc.party = docname
doc.is_default = 1
return doc return doc
def get_party_bank_account(party_type, party): def get_party_bank_account(party_type, party):
return frappe.db.get_value(party_type, party, "default_bank_account") return frappe.db.get_value(
"Bank Account",
{"party_type": party_type, "party": party, "is_default": 1, "disabled": 0},
"name",
)
def get_default_company_bank_account(company): def get_default_company_bank_account(company, party_type, party):
return frappe.db.get_value("Bank Account", {"company": company, "is_company_account": 1, "is_default": 1}) default_company_bank_account = frappe.db.get_value(party_type, party, "default_bank_account")
if default_company_bank_account:
if company != frappe.get_cached_value("Bank Account", default_company_bank_account, "company"):
default_company_bank_account = None
if not default_company_bank_account:
default_company_bank_account = frappe.db.get_value(
"Bank Account", {"company": company, "is_company_account": 1, "is_default": 1}
)
return default_company_bank_account
@frappe.whitelist() @frappe.whitelist()

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

@@ -2036,8 +2036,7 @@ def get_party_details(company, party_type, party, date, cost_center=None):
if party_type in ["Customer", "Supplier"]: if party_type in ["Customer", "Supplier"]:
party_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) bank_account = get_default_company_bank_account(company, party_type, party)
return { return {
"party_account": party_account, "party_account": party_account,
"party_name": party_name, "party_name": party_name,