Skip to content

Commit

Permalink
fix: payment recon not showing payment entry when party_type is Stude…
Browse files Browse the repository at this point in the history
…nt (#36920)

* 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
  • Loading branch information
RitvikSardana authored Sep 5, 2023
1 parent 13ca474 commit d2f03c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion erpnext/accounts/party.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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)
if advance_account:
return [account, advance_account]
Expand Down
5 changes: 3 additions & 2 deletions erpnext/controllers/accounts_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -2437,7 +2437,8 @@ def get_common_query(
limit,
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")

q = (
Expand All @@ -2454,7 +2455,7 @@ def get_common_query(
.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)
q = q.where(payment_entry.paid_from.isin(party_account))
Expand Down

0 comments on commit d2f03c8

Please sign in to comment.