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

fix: group warehouse filter not working for Batchwise Balance history report

Browse Source 
(cherry picked from commit 6381e75fa5)
This commit is contained in:
Rohit Waghchaure
2022-10-17 12:17:05 +05:30
committed by Mergify
parent 2db1da0c8a
commit faedd85b66
1 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import cint, flt, getdate from frappe.utils import cint, flt, getdate
from pypika import functions as fn
from pypika.terms import ExistsCriterion
def execute(filters=None): def execute(filters=None):
@@ -64,36 +66,61 @@ def get_columns(filters):
return columns return columns
def get_conditions(filters): # get all details
conditions = "" def get_stock_ledger_entries(filters):
if not filters.get("from_date"): if not filters.get("from_date"):
frappe.throw(_("'From Date' is required")) frappe.throw(_("'From Date' is required"))
if filters.get("to_date"): sle = frappe.qb.DocType("Stock Ledger Entry")
conditions += " and posting_date <= '%s'" % filters["to_date"] query = (
frappe.qb.from_(sle)
.select(
sle.item_code,
sle.warehouse,
sle.batch_no,
sle.posting_date,
fn.Sum(sle.actual_qty).as_("actual_qty"),
)
.where(
(sle.docstatus < 2)
& (sle.is_cancelled == 0)
& (sle.batch_no.isnotnull())
& (sle.batch_no != "")
)
.groupby(sle.voucher_no, sle.batch_no, sle.item_code, sle.warehouse)
.orderby(sle.item_code, sle.warehouse)
)
if to_date := filters.get("to_date"):
query = query.where(sle.posting_date <= to_date)
else: else:
frappe.throw(_("'To Date' is required")) frappe.throw(_("'To Date' is required"))
for field in ["item_code", "warehouse", "batch_no", "company"]: query = apply_warehouse_filter(query, sle, filters)
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))) query = query.where(sle[field] == filters.get(field))
return conditions return query.run(as_dict=True)
# get all details def apply_warehouse_filter(query, sle, filters):
def get_stock_ledger_entries(filters): if warehouse := filters.get("warehouse"):
conditions = get_conditions(filters) warehouse_table = frappe.qb.DocType("Warehouse")
return frappe.db.sql(
""" lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
select item_code, batch_no, warehouse, posting_date, sum(actual_qty) as actual_qty chilren_subquery = (
from `tabStock Ledger Entry` frappe.qb.from_(warehouse_table)
where is_cancelled = 0 and docstatus < 2 and ifnull(batch_no, '') != '' %s .select(warehouse_table.name)
group by voucher_no, batch_no, item_code, warehouse .where(
order by item_code, warehouse""" (warehouse_table.lft >= lft)
% conditions, & (warehouse_table.rgt <= rgt)
as_dict=1, & (warehouse_table.name == sle.warehouse)
) )
)
query = query.where(ExistsCriterion(chilren_subquery))
return query
def get_item_warehouse_batch_map(filters, float_precision): def get_item_warehouse_batch_map(filters, float_precision):