Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: only show advance payment entries where "book_advance_payments_in_separate_party_account" is true (backport #44545) #44622

Merged
merged 1 commit into from
Dec 10, 2024
Merged

fix: only show advance payment entries where "book_advance_payments_in_separate_party_account" is true (backport #44545) #44622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,7 @@ def get_nonreconciled_payment_entries(self):
self.add_payment_entries(non_reconciled_payments)

def get_payment_entries(self):
if self.default_advance_account:
party_account = [self.receivable_payable_account, self.default_advance_account]
else:
party_account = [self.receivable_payable_account]
party_account = [self.receivable_payable_account]

order_doctype = "Sales Order" if self.party_type == "Customer" else "Purchase Order"
condition = frappe._dict(
Expand Down Expand Up @@ -187,6 +184,7 @@ def get_payment_entries(self):
self.party,
party_account,
order_doctype,
default_advance_account=self.default_advance_account,
against_all_orders=True,
limit=self.payment_limit,
condition=condition,
Expand Down
26 changes: 19 additions & 7 deletions erpnext/controllers/accounts_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2916,6 +2916,7 @@ def get_advance_payment_entries(
party_account,
order_doctype,
order_list=None,
default_advance_account=None,
include_unallocated=True,
against_all_orders=False,
limit=None,
Expand All @@ -2929,6 +2930,7 @@ def get_advance_payment_entries(
party_type,
party,
party_account,
default_advance_account,
limit,
condition,
)
Expand All @@ -2952,6 +2954,7 @@ def get_advance_payment_entries(
party_type,
party,
party_account,
default_advance_account,
limit,
condition,
)
Expand All @@ -2967,6 +2970,7 @@ def get_common_query(
party_type,
party,
party_account,
default_advance_account,
limit,
condition,
):
Expand All @@ -2988,14 +2992,22 @@ def get_common_query(
.where(payment_entry.docstatus == 1)
)

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))
field = "paid_from" if payment_type == "Receive" else "paid_to"

q = q.select((payment_entry[f"{field}_account_currency"]).as_("currency"))
q = q.select(payment_entry[field])
account_condition = payment_entry[field].isin(party_account)
if default_advance_account:
q = q.where(
account_condition
| (
(payment_entry[field] == default_advance_account)
& (payment_entry.book_advance_payments_in_separate_party_account == 1)
)
)

else:
q = q.select((payment_entry.paid_to_account_currency).as_("currency"))
q = q.select(payment_entry.paid_to)
q = q.where(payment_entry.paid_to.isin(party_account))
q = q.where(account_condition)

if payment_type == "Receive":
q = q.select((payment_entry.source_exchange_rate).as_("exchange_rate"))
Expand Down
Loading