fix(report): include descendants when filtering by parent item group
This commit is contained in:
committed by
ruthra kumar
parent
829550cd99
commit
d21bfa219d
@@ -6,6 +6,7 @@ import frappe
|
||||
from frappe import _
|
||||
from frappe.model.meta import get_field_precision
|
||||
from frappe.utils import cstr, flt
|
||||
from frappe.utils.nestedset import get_descendants_of
|
||||
from frappe.utils.xlsxutils import handle_html
|
||||
from pypika import Order
|
||||
|
||||
@@ -375,7 +376,12 @@ def apply_conditions(query, si, sii, filters, additional_conditions=None):
|
||||
query = query.where(sii.item_code == filters.get("item_code"))
|
||||
|
||||
if filters.get("item_group"):
|
||||
query = query.where(sii.item_group == filters.get("item_group"))
|
||||
if frappe.db.get_value("Item Group", filters.get("item_group"), "is_group"):
|
||||
item_groups = get_descendants_of("Item Group", filters.get("item_group"))
|
||||
item_groups.append(filters.get("item_group"))
|
||||
query = query.where(sii.item_group.isin(item_groups))
|
||||
else:
|
||||
query = query.where(sii.item_group == filters.get("item_group"))
|
||||
|
||||
if filters.get("income_account"):
|
||||
query = query.where(
|
||||
|
||||
Reference in New Issue
Block a user