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

fix: item group filter in sales person wise report

Browse Source
This commit is contained in:
ruthra kumar 2023-12-03 10:33:31 +05:30
parent 68aee8c144
commit f4d418ea6d
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
View File

@ -3,7 +3,8 @@
import frappe import frappe
from frappe import _, msgprint from frappe import _, msgprint, qb
from frappe.query_builder import Criterion
from erpnext import get_company_currency from erpnext import get_company_currency
@ -214,24 +215,33 @@ def get_conditions(filters, date_field):
if items: if items:
conditions.append("dt_item.item_code in (%s)" % ", ".join(["%s"] * len(items))) conditions.append("dt_item.item_code in (%s)" % ", ".join(["%s"] * len(items)))
values += items values += items
else:
# return empty result, if no items are fetched after filtering on 'item group' and 'brand'
conditions.append("dt_item.item_code = Null")
return " and ".join(conditions), values return " and ".join(conditions), values
def get_items(filters): def get_items(filters):
item = qb.DocType("Item")
item_query_conditions = []
if filters.get("item_group"): if filters.get("item_group"):
key = "item_group" # Handle 'Parent' nodes as well.
elif filters.get("brand"): item_group = qb.DocType("Item Group")
key = "brand" lft, rgt = frappe.db.get_all(
else: "Item Group", filters={"name": filters.get("item_group")}, fields=["lft", "rgt"], as_list=True
key = "" )[0]
item_group_query = (
items = [] qb.from_(item_group)
if key: .select(item_group.name)
items = frappe.db.sql_list( .where((item_group.lft >= lft) & (item_group.rgt <= rgt))
"""select name from tabItem where %s = %s""" % (key, "%s"), (filters[key])
) )
item_query_conditions.append(item.item_group.isin(item_group_query))
if filters.get("brand"):
item_query_conditions.append(item.brand == filters.get("brand"))
items = qb.from_(item).select(item.name).where(Criterion.all(item_query_conditions)).run()
return items return items