mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-19 13:09:17 +00:00
Merge pull request #49934 from frappe/mergify/bp/version-15-hotfix/pr-49846
chore(Stock Qty vs Serial No Count): add show_disabled_items filter (backport #49846)
This commit is contained in:
@@ -24,6 +24,11 @@ frappe.query_reports["Stock Qty vs Serial No Count"] = {
|
|||||||
},
|
},
|
||||||
reqd: 1,
|
reqd: 1,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
fieldname: "show_disables_items",
|
||||||
|
label: __("Show Disabled Items"),
|
||||||
|
fieldtype: "Check",
|
||||||
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
formatter: function (value, row, column, data, default_formatter) {
|
formatter: function (value, row, column, data, default_formatter) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ from frappe import _
|
|||||||
def execute(filters=None):
|
def execute(filters=None):
|
||||||
validate_warehouse(filters)
|
validate_warehouse(filters)
|
||||||
columns = get_columns()
|
columns = get_columns()
|
||||||
data = get_data(filters.warehouse)
|
data = get_data(filters.warehouse, filters.show_disables_items)
|
||||||
return columns, data
|
return columns, data
|
||||||
|
|
||||||
|
|
||||||
@@ -38,12 +38,13 @@ def get_columns():
|
|||||||
return columns
|
return columns
|
||||||
|
|
||||||
|
|
||||||
def get_data(warehouse):
|
def get_data(warehouse, show_disables_items):
|
||||||
|
filters = {"has_serial_no": True}
|
||||||
|
if not show_disables_items:
|
||||||
|
filters["disabled"] = False
|
||||||
serial_item_list = frappe.get_all(
|
serial_item_list = frappe.get_all(
|
||||||
"Item",
|
"Item",
|
||||||
filters={
|
filters=filters,
|
||||||
"has_serial_no": True,
|
|
||||||
},
|
|
||||||
fields=["item_code", "item_name"],
|
fields=["item_code", "item_name"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user