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

refactor: rewrite Batch Item Expiry Status Report queries in QB

Browse Source
This commit is contained in:
Sagar Sharma 2022-09-23 13:52:26 +05:30
parent 4efb8b142c
commit 2c9d9577e3
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
View File

@ -4,6 +4,7 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.query_builder.functions import IfNull
from frappe.utils import cint, getdate from frappe.utils import cint, getdate
@ -54,31 +55,28 @@ def get_columns(filters):
return columns return columns
def get_conditions(filters): def get_stock_ledger_entries(filters):
conditions = ""
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"): if not filters.get("to_date"):
conditions += " and posting_date <= '%s'" % filters["to_date"]
else:
frappe.throw(_("'To Date' is required")) frappe.throw(_("'To Date' is required"))
return conditions sle = frappe.qb.DocType("Stock Ledger Entry")
query = (
frappe.qb.from_(sle)
def get_stock_ledger_entries(filters): .select(sle.item_code, sle.batch_no, sle.warehouse, sle.posting_date, sle.actual_qty)
conditions = get_conditions(filters) .where(
return frappe.db.sql( (sle.is_cancelled == 0)
"""select item_code, batch_no, warehouse, & (sle.docstatus < 2)
posting_date, actual_qty & (IfNull(sle.batch_no, "") != "")
from `tabStock Ledger Entry` & (sle.posting_date <= filters["to_date"])
where is_cancelled = 0 )
and docstatus < 2 and ifnull(batch_no, '') != '' %s order by item_code, warehouse""" .orderby(sle.item_code, sle.warehouse)
% conditions,
as_dict=1,
) )
return query.run(as_dict=True)
def get_item_warehouse_batch_map(filters, float_precision): def get_item_warehouse_batch_map(filters, float_precision):
sle = get_stock_ledger_entries(filters) sle = get_stock_ledger_entries(filters)
@ -112,7 +110,7 @@ def get_item_warehouse_batch_map(filters, float_precision):
def get_item_details(filters): def get_item_details(filters):
item_map = {} item_map = {}
for d in frappe.db.sql("select name, item_name, description from tabItem", as_dict=1): for d in (frappe.qb.from_("Item").select("name", "item_name", "description")).run(as_dict=True):
item_map.setdefault(d.name, d) item_map.setdefault(d.name, d)
return item_map return item_map