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

Merge pull request #38220 from rtdany10/wrong-advance

Browse Source 
fix: exclude `invoice_doctypes` from party advance
This commit is contained in:
ruthra kumar 2023-12-04 10:57:15 +05:30 committed by GitHub
commit 94fabe0321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/party.py
View File

@ -195,7 +195,7 @@ def set_address_details(
company_address=None, company_address=None,
shipping_address=None, shipping_address=None,
*, *,
ignore_permissions=False ignore_permissions=False,
): ):
billing_address_field = ( billing_address_field = (
"customer_address" if party_type == "Lead" else party_type.lower() + "_address" "customer_address" if party_type == "Lead" else party_type.lower() + "_address"
@ -239,7 +239,7 @@ def set_address_details(
shipping_address_display=render_address( shipping_address_display=render_address(
shipping_address, check_permissions=not ignore_permissions 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: if party_details.company_address:
@ -250,7 +250,7 @@ def set_address_details(
party_details.company_address_display party_details.company_address_display
or render_address(party_details.company_address, check_permissions=False) 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 # shipping address - if not already set
@ -258,7 +258,7 @@ def set_address_details(
party_details.update( party_details.update(
shipping_address=party_details.billing_address, shipping_address=party_details.billing_address,
shipping_address_display=party_details.billing_address_display, 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 = ( party_address, shipping_address = (
@ -981,6 +981,9 @@ def get_partywise_advanced_payment_amount(
if party: if party:
query = query.where(ple.party == 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() data = query.run()
if data: if data:
return frappe._dict(data) return frappe._dict(data)