From a0e7787f7b73f433018e3091097d1cb83765c974 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 10 Mar 2021 13:46:42 +0530 Subject: [PATCH] fix: removed show cancelled entries checkbox from the stock ledger report (#24826) --- erpnext/stock/report/stock_ledger/stock_ledger.js | 5 ----- erpnext/stock/report/stock_ledger/stock_ledger.py | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js index 6f12c2731bb..fe2417bba7e 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.js +++ b/erpnext/stock/report/stock_ledger/stock_ledger.js @@ -82,11 +82,6 @@ frappe.query_reports["Stock Ledger"] = { "label": __("Include UOM"), "fieldtype": "Link", "options": "UOM" - }, - { - "fieldname": "show_cancelled_entries", - "label": __("Show Cancelled Entries"), - "fieldtype": "Check" } ], "formatter": function (value, row, column, data, default_formatter) { diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index 7b5701a9932..36996e96745 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -138,7 +138,7 @@ def get_stock_ledger_entries(filters, items): `tabStock Ledger Entry` sle WHERE company = %(company)s - AND posting_date BETWEEN %(from_date)s AND %(to_date)s + AND is_cancelled = 0 AND posting_date BETWEEN %(from_date)s AND %(to_date)s {sle_conditions} {item_conditions_sql} ORDER BY @@ -209,9 +209,6 @@ def get_sle_conditions(filters): if filters.get("project"): conditions.append("project=%(project)s") - if not filters.get("show_cancelled_entries"): - conditions.append("is_cancelled = 0") - return "and {}".format(" and ".join(conditions)) if conditions else ""