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: exclude invoice_doctypes from party advance #38220

Merged
merged 1 commit into from
Dec 4, 2023
Merged

fix: exclude invoice_doctypes from party advance #38220

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
11 changes: 7 additions & 4 deletions erpnext/accounts/party.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def set_address_details(
company_address=None,
shipping_address=None,
*,
ignore_permissions=False
ignore_permissions=False,
):
billing_address_field = (
"customer_address" if party_type == "Lead" else party_type.lower() + "_address"
Expand Down Expand Up @@ -239,7 +239,7 @@ def set_address_details(
shipping_address_display=render_address(
shipping_address, check_permissions=not ignore_permissions
),
**get_fetch_values(doctype, "shipping_address", shipping_address)
**get_fetch_values(doctype, "shipping_address", shipping_address),
)

if party_details.company_address:
Expand All @@ -250,15 +250,15 @@ def set_address_details(
party_details.company_address_display
or render_address(party_details.company_address, check_permissions=False)
),
**get_fetch_values(doctype, "billing_address", party_details.company_address)
**get_fetch_values(doctype, "billing_address", party_details.company_address),
)

# shipping address - if not already set
if not party_details.shipping_address:
party_details.update(
shipping_address=party_details.billing_address,
shipping_address_display=party_details.billing_address_display,
**get_fetch_values(doctype, "shipping_address", party_details.billing_address)
**get_fetch_values(doctype, "shipping_address", party_details.billing_address),
)

party_address, shipping_address = (
Expand Down Expand Up @@ -981,6 +981,9 @@ def get_partywise_advanced_payment_amount(
if party:
query = query.where(ple.party == party)

if invoice_doctypes := frappe.get_hooks("invoice_doctypes"):
query = query.where(ple.voucher_type.notin(invoice_doctypes))

data = query.run()
if data:
return frappe._dict(data)
Expand Down