nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39136 from frappe/mergify/bp/version-14-hotfix/pr-39125

Browse Source 
fix: ignore cancelled payments in Sales/Purchase Register (backport #39125)
This commit is contained in:
ruthra kumar
2024-01-15 14:49:22 +05:30
committed by GitHub
parent 4af3159f62 a6bc5cae90
commit 46d846bf1a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@@ -433,7 +433,7 @@ def get_payments(filters):
account_fieldname="paid_to", account_fieldname="paid_to",
party="supplier", party="supplier",
party_name="supplier_name", party_name="supplier_name",
party_account=get_party_account("Supplier", filters.supplier, filters.company), party_account=[get_party_account("Supplier", filters.supplier, filters.company)],
) )
payment_entries = get_payment_entries(filters, args) payment_entries = get_payment_entries(filters, args)
journal_entries = get_journal_entries(filters, args) journal_entries = get_journal_entries(filters, args)

2
erpnext/accounts/report/sales_register/sales_register.py
View File

@@ -477,7 +477,7 @@ def get_payments(filters):
account_fieldname="paid_from", account_fieldname="paid_from",
party="customer", party="customer",
party_name="customer_name", party_name="customer_name",
party_account=get_party_account("Customer", filters.customer, filters.company), party_account=[get_party_account("Customer", filters.customer, filters.company)],
) )
payment_entries = get_payment_entries(filters, args) payment_entries = get_payment_entries(filters, args)
journal_entries = get_journal_entries(filters, args) journal_entries = get_journal_entries(filters, args)

7
erpnext/accounts/report/utils.py
View File

@@ -251,8 +251,9 @@ def get_journal_entries(filters, args):
) )
.where( .where(
(je.voucher_type == "Journal Entry") (je.voucher_type == "Journal Entry")
& (je.docstatus == 1)
& (journal_account.party == filters.get(args.party)) & (journal_account.party == filters.get(args.party))
& (journal_account.account == args.party_account) & (journal_account.account.isin(args.party_account))
) )
.orderby(je.posting_date, je.name, order=Order.desc) .orderby(je.posting_date, je.name, order=Order.desc)
) )
@@ -281,7 +282,9 @@ def get_payment_entries(filters, args):
pe.cost_center, pe.cost_center,
) )
.where( .where(
(pe.party == filters.get(args.party)) & (pe[args.account_fieldname] == args.party_account) (pe.docstatus == 1)
& (pe.party == filters.get(args.party))
& (pe[args.account_fieldname].isin(args.party_account))
) )
.orderby(pe.posting_date, pe.name, order=Order.desc) .orderby(pe.posting_date, pe.name, order=Order.desc)
) )