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

refactor: use payment ledger to fetch advance amount

Browse Source
This commit is contained in:
ruthra kumar 2023-08-21 08:46:55 +05:30
parent 896b123fb1
commit 0dc5e5c430
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/accounts/party.py
View File

@ -14,7 +14,7 @@ from frappe.contacts.doctype.address.address import (
from frappe.contacts.doctype.contact.contact import get_contact_details from frappe.contacts.doctype.contact.contact import get_contact_details
from frappe.core.doctype.user_permission.user_permission import get_permitted_documents from frappe.core.doctype.user_permission.user_permission import get_permitted_documents
from frappe.model.utils import get_fetch_values from frappe.model.utils import get_fetch_values
from frappe.query_builder.functions import Date, Sum from frappe.query_builder.functions import Abs, Date, Sum
from frappe.utils import ( from frappe.utils import (
add_days, add_days,
add_months, add_months,
@ -922,33 +922,32 @@ def get_party_shipping_address(doctype: str, name: str) -> Optional[str]:
def get_partywise_advanced_payment_amount( def get_partywise_advanced_payment_amount(
party_type, posting_date=None, future_payment=0, company=None, party=None, account_type=None party_type, posting_date=None, future_payment=0, company=None, party=None
): ):
gle = frappe.qb.DocType("GL Entry") ple = frappe.qb.DocType("Payment Ledger Entry")
query = ( query = (
frappe.qb.from_(gle) frappe.qb.from_(ple)
.select(gle.party) .select(ple.party, Abs(Sum(ple.amount).as_("amount")))
.where( .where(
(gle.party_type.isin(party_type)) & (gle.against_voucher.isnull()) & (gle.is_cancelled == 0) (ple.party_type.isin(party_type))
& (ple.amount < 0)
& (ple.against_voucher_no == ple.voucher_no)
& (ple.delinked == 0)
) )
.groupby(gle.party) .groupby(ple.party)
) )
if account_type == "Receivable":
query = query.select(Sum(gle.credit).as_("amount"))
else:
query = query.select(Sum(gle.debit).as_("amount"))
if posting_date: if posting_date:
if future_payment: if future_payment:
query = query.where((gle.posting_date <= posting_date) | (Date(gle.creation) <= posting_date)) query = query.where((ple.posting_date <= posting_date) | (Date(ple.creation) <= posting_date))
else: else:
query = query.where(gle.posting_date <= posting_date) query = query.where(ple.posting_date <= posting_date)
if company: if company:
query = query.where(gle.company == company) query = query.where(ple.company == company)
if party: if party:
query = query.where(gle.party == party) query = query.where(ple.party == party)
data = query.run() data = query.run()
if data: if data:

1
erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
View File

@ -50,7 +50,6 @@ class AccountsReceivableSummary(ReceivablePayableReport):
self.filters.show_future_payments, self.filters.show_future_payments,
self.filters.company, self.filters.company,
party=party, party=party,
account_type=self.account_type,
) )
or {} or {}
) )