schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: group warehouse filter not working for Batch-wise Balance history report

Browse Source
This commit is contained in:
Rohit Waghchaure
2022-10-31 23:21:29 +05:30
parent 0c24ba0118
commit 310e7c522c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
View File

@@ -74,10 +74,21 @@ def get_conditions(filters):
else: else:
frappe.throw(_("'To Date' is required")) frappe.throw(_("'To Date' is required"))
for field in ["item_code", "warehouse", "batch_no", "company"]: for field in ["item_code", "batch_no", "company"]:
if filters.get(field): if filters.get(field):
conditions += " and {0} = {1}".format(field, frappe.db.escape(filters.get(field))) conditions += " and {0} = {1}".format(field, frappe.db.escape(filters.get(field)))
if filters.get("warehouse"):
warehouse_details = frappe.db.get_value(
"Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1
)
if warehouse_details:
conditions += (
" and exists (select name from `tabWarehouse` wh \
where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"
% (warehouse_details.lft, warehouse_details.rgt)
)
return conditions return conditions
@@ -87,7 +98,7 @@ def get_stock_ledger_entries(filters):
return frappe.db.sql( return frappe.db.sql(
""" """
select item_code, batch_no, warehouse, posting_date, sum(actual_qty) as actual_qty select item_code, batch_no, warehouse, posting_date, sum(actual_qty) as actual_qty
from `tabStock Ledger Entry` from `tabStock Ledger Entry` as sle
where is_cancelled = 0 and docstatus < 2 and ifnull(batch_no, '') != '' %s where is_cancelled = 0 and docstatus < 2 and ifnull(batch_no, '') != '' %s
group by voucher_no, batch_no, item_code, warehouse group by voucher_no, batch_no, item_code, warehouse
order by item_code, warehouse""" order by item_code, warehouse"""