From 36b8e972f11cb860c06ca3ca1726103be3217bb4 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 3 Jan 2024 20:56:12 +0530 Subject: [PATCH 1/2] fix: ignore cancelled payments in Sales/Purchase Register (cherry picked from commit 0f1be03faf96aaf83063e28dc57a5e016944683c) --- erpnext/accounts/report/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index 7dd61d2c64cf..01bc29fedf3d 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -251,6 +251,7 @@ def get_journal_entries(filters, args): ) .where( (je.voucher_type == "Journal Entry") + & (je.docstatus == 1) & (journal_account.party == filters.get(args.party)) & (journal_account.account == args.party_account) ) @@ -281,7 +282,9 @@ def get_payment_entries(filters, args): pe.cost_center, ) .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) ) From a6bc5cae90465d6d517c59c61769623724f8eacd Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 15 Jan 2024 14:10:55 +0530 Subject: [PATCH 2/2] fix: pass accounts as list to query --- erpnext/accounts/report/purchase_register/purchase_register.py | 2 +- erpnext/accounts/report/sales_register/sales_register.py | 2 +- erpnext/accounts/report/utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py index 4eb135b04878..b4ab5b8fa4ee 100644 --- a/erpnext/accounts/report/purchase_register/purchase_register.py +++ b/erpnext/accounts/report/purchase_register/purchase_register.py @@ -433,7 +433,7 @@ def get_payments(filters): account_fieldname="paid_to", party="supplier", 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) journal_entries = get_journal_entries(filters, args) diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py index 61b1fe2293cd..1cb72f8d2d6f 100644 --- a/erpnext/accounts/report/sales_register/sales_register.py +++ b/erpnext/accounts/report/sales_register/sales_register.py @@ -477,7 +477,7 @@ def get_payments(filters): account_fieldname="paid_from", party="customer", 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) journal_entries = get_journal_entries(filters, args) diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index 01bc29fedf3d..79ab799ccd3c 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -253,7 +253,7 @@ def get_journal_entries(filters, args): (je.voucher_type == "Journal Entry") & (je.docstatus == 1) & (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) )