CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-31 19:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Payment entry against employee

Browse Source 
(cherry picked from commit 93e6c6ccab)
This commit is contained in:
Deepesh Garg
2024-04-19 17:38:11 +05:30
committed by Mergify
parent a8866b61a1
commit 060d46af42
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2028,6 +2028,8 @@ def get_negative_outstanding_invoices(
@frappe.whitelist() @frappe.whitelist()
def get_party_details(company, party_type, party, date, cost_center=None): def get_party_details(company, party_type, party, date, cost_center=None):
bank_account = "" bank_account = ""
party_bank_account = ""
if not frappe.db.exists(party_type, party): if not frappe.db.exists(party_type, party):
frappe.throw(_("{0} {1} does not exist").format(_(party_type), party)) frappe.throw(_("{0} {1} does not exist").format(_(party_type), party))
@@ -2039,8 +2041,8 @@ def get_party_details(company, party_type, party, date, cost_center=None):
party_balance = get_balance_on(party_type=party_type, party=party, cost_center=cost_center) party_balance = get_balance_on(party_type=party_type, party=party, cost_center=cost_center)
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, party_type, party)
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,

5
erpnext/accounts/doctype/payment_entry/test_payment_entry.py
View File

@@ -10,6 +10,7 @@ from frappe.utils import add_days, flt, nowdate
from erpnext.accounts.doctype.account.test_account import create_account from erpnext.accounts.doctype.account.test_account import create_account
from erpnext.accounts.doctype.payment_entry.payment_entry import ( from erpnext.accounts.doctype.payment_entry.payment_entry import (
get_outstanding_reference_documents, get_outstanding_reference_documents,
get_party_details,
get_payment_entry, get_payment_entry,
get_reference_details, get_reference_details,
) )
@@ -1684,6 +1685,10 @@ def create_payment_entry(**args):
payment_entry.reference_no = "Test001" payment_entry.reference_no = "Test001"
payment_entry.reference_date = nowdate() payment_entry.reference_date = nowdate()
get_party_details(
payment_entry.company, payment_entry.party_type, payment_entry.party, payment_entry.posting_date
)
if args.get("save"): if args.get("save"):
payment_entry.save() payment_entry.save()
if args.get("submit"): if args.get("submit"):