nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 02:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(report): include descendants when filtering by parent item group

Browse Source
This commit is contained in:
FATHIH MOHAMMED
2025-05-17 10:54:23 +00:00
committed by ruthra kumar
parent 829550cd99
commit d21bfa219d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -6,6 +6,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.model.meta import get_field_precision from frappe.model.meta import get_field_precision
from frappe.utils import cstr, flt from frappe.utils import cstr, flt
from frappe.utils.nestedset import get_descendants_of
from frappe.utils.xlsxutils import handle_html from frappe.utils.xlsxutils import handle_html
from pypika import Order 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")) query = query.where(sii.item_code == filters.get("item_code"))
if filters.get("item_group"): 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"): if filters.get("income_account"):
query = query.where( query = query.where(