From 5102d0c3f7604cd7d9363ce502c49c7122a50dc4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 21:39:38 +0530 Subject: [PATCH] fix: Share ledger showing cancelled docs (#35993) fix: Share ledger showing cancelled docs (#35993) (cherry picked from commit 0a17c78a363e81be5b7e5bfd55f93ade122c176c) Co-authored-by: Deepesh Garg --- erpnext/accounts/report/share_ledger/share_ledger.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/share_ledger/share_ledger.py b/erpnext/accounts/report/share_ledger/share_ledger.py index d6c3bd059f4..629528e5cc7 100644 --- a/erpnext/accounts/report/share_ledger/share_ledger.py +++ b/erpnext/accounts/report/share_ledger/share_ledger.py @@ -67,8 +67,9 @@ def get_all_transfers(date, shareholder): # condition = 'AND company = %(company)s ' return frappe.db.sql( """SELECT * FROM `tabShare Transfer` - WHERE (DATE(date) <= %(date)s AND from_shareholder = %(shareholder)s {condition}) - OR (DATE(date) <= %(date)s AND to_shareholder = %(shareholder)s {condition}) + WHERE ((DATE(date) <= %(date)s AND from_shareholder = %(shareholder)s {condition}) + OR (DATE(date) <= %(date)s AND to_shareholder = %(shareholder)s {condition})) + AND docstatus = 1 ORDER BY date""".format( condition=condition ),