Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: payment recon not showing payment entry when party_type is Student (#36920)

Browse Source 
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
This commit is contained in:
RitvikSardana 2023-09-05 12:00:54 +05:30 committed by GitHub
parent 13ca474a46
commit d2f03c8a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/party.py
View File

@ -409,7 +409,7 @@ def get_party_account(party_type, party=None, company=None, include_advance=Fals
if (account and account_currency != existing_gle_currency) or not account: if (account and account_currency != existing_gle_currency) or not account:
account = get_party_gle_account(party_type, party, company) account = get_party_gle_account(party_type, party, company)
if include_advance and party_type in ["Customer", "Supplier"]: if include_advance and party_type in ["Customer", "Supplier", "Student"]:
advance_account = get_party_advance_account(party_type, party, company) advance_account = get_party_advance_account(party_type, party, company)
if advance_account: if advance_account:
return [account, advance_account] return [account, advance_account]

5
erpnext/controllers/accounts_controller.py
View File

@ -2437,7 +2437,8 @@ def get_common_query(
limit, limit,
condition, condition,
): ):
payment_type = "Receive" if party_type == "Customer" else "Pay" account_type = frappe.db.get_value("Party Type", party_type, "account_type")
payment_type = "Receive" if account_type == "Receivable" else "Pay"
payment_entry = frappe.qb.DocType("Payment Entry") payment_entry = frappe.qb.DocType("Payment Entry")
q = ( q = (
@ -2454,7 +2455,7 @@ def get_common_query(
.where(payment_entry.docstatus == 1) .where(payment_entry.docstatus == 1)
) )
if party_type == "Customer": if payment_type == "Receive":
q = q.select((payment_entry.paid_from_account_currency).as_("currency")) q = q.select((payment_entry.paid_from_account_currency).as_("currency"))
q = q.select(payment_entry.paid_from) q = q.select(payment_entry.paid_from)
q = q.where(payment_entry.paid_from.isin(party_account)) q = q.where(payment_entry.paid_from.isin(party_account))