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

fix: warehouse filter in Product Bundle Balance (#42532)

Browse Source
This commit is contained in:
rohitwaghchaure
2024-07-30 14:26:06 +05:30
committed by GitHub
parent c5d68333c9
commit 0ecfa709d8
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/report/product_bundle_balance/product_bundle_balance.js
View File

@@ -3,6 +3,14 @@
frappe.query_reports["Product Bundle Balance"] = { frappe.query_reports["Product Bundle Balance"] = {
filters: [ filters: [
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
reqd: 1,
},
{ {
fieldname: "date", fieldname: "date",
label: __("Date"), label: __("Date"),

5
erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
View File

@@ -224,6 +224,9 @@ def get_stock_ledger_entries(filters, items):
.where((sle2.name.isnull()) & (sle.docstatus < 2) & (sle.item_code.isin(items))) .where((sle2.name.isnull()) & (sle.docstatus < 2) & (sle.item_code.isin(items)))
) )
if filters.get("company"):
query = query.where(sle.company == filters.get("company"))
if date := filters.get("date"): if date := filters.get("date"):
query = query.where(sle.posting_date <= date) query = query.where(sle.posting_date <= date)
else: else:
@@ -237,7 +240,7 @@ def get_stock_ledger_entries(filters, items):
if warehouse_details: if warehouse_details:
wh = frappe.qb.DocType("Warehouse") wh = frappe.qb.DocType("Warehouse")
query = query.where( query = query.where(
ExistsCriterion( sle.warehouse.isin(
frappe.qb.from_(wh) frappe.qb.from_(wh)
.select(wh.name) .select(wh.name)
.where((wh.lft >= warehouse_details.lft) & (wh.rgt <= warehouse_details.rgt)) .where((wh.lft >= warehouse_details.lft) & (wh.rgt <= warehouse_details.rgt))