fix: item_code filter in item-wise sales-purchase register

(cherry picked from commit 757aef3972)
This commit is contained in:
Nihantra Patel
2024-06-17 12:33:14 +05:30
committed by Mergify
parent 5a2005395b
commit 98c8feded0
3 changed files with 14 additions and 2 deletions

View File

@@ -289,7 +289,7 @@ def get_columns(additional_table_columns, filters):
def apply_conditions(query, pi, pii, filters):
for opts in ("company", "supplier", "item_code", "mode_of_payment"):
for opts in ("company", "supplier", "mode_of_payment"):
if filters.get(opts):
query = query.where(pi[opts] == filters[opts])
@@ -299,6 +299,9 @@ def apply_conditions(query, pi, pii, filters):
if filters.get("to_date"):
query = query.where(pi.posting_date <= filters.get("to_date"))
if filters.get("item_code"):
query = query.where(pii.item_code == filters.get("item_code"))
if filters.get("item_group"):
query = query.where(pii.item_group == filters.get("item_group"))

View File

@@ -54,6 +54,12 @@ frappe.query_reports["Item-wise Sales Register"] = {
fieldtype: "Link",
options: "Brand",
},
{
fieldname: "item_code",
label: __("Item"),
fieldtype: "Link",
options: "Item",
},
{
fieldname: "item_group",
label: __("Item Group"),

View File

@@ -342,7 +342,7 @@ def get_columns(additional_table_columns, filters):
def apply_conditions(query, si, sii, filters, additional_conditions=None):
for opts in ("company", "customer", "item_code"):
for opts in ("company", "customer"):
if filters.get(opts):
query = query.where(si[opts] == filters[opts])
@@ -371,6 +371,9 @@ def apply_conditions(query, si, sii, filters, additional_conditions=None):
if filters.get("brand"):
query = query.where(sii.brand == filters.get("brand"))
if filters.get("item_code"):
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"))