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

fix: Share ledger showing cancelled docs (#35993)

Browse Source
This commit is contained in:
Deepesh Garg 2023-07-04 17:49:07 +05:30 committed by GitHub
parent 30e4052a76
commit 0a17c78a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/share_ledger/share_ledger.py
View File

@ -67,8 +67,9 @@ def get_all_transfers(date, shareholder):
# condition = 'AND company = %(company)s ' # condition = 'AND company = %(company)s '
return frappe.db.sql( return frappe.db.sql(
"""SELECT * FROM `tabShare Transfer` """SELECT * FROM `tabShare Transfer`
WHERE (DATE(date) <= %(date)s AND from_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}) OR (DATE(date) <= %(date)s AND to_shareholder = %(shareholder)s {condition}))
AND docstatus = 1
ORDER BY date""".format( ORDER BY date""".format(
condition=condition condition=condition
), ),