Merge pull request #34882 from rohitwaghchaure/filter-to-hide-disabled-warehouses
fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report
This commit is contained in:
commit
9f399f8741
@ -11,6 +11,13 @@ frappe.query_reports["Warehouse Wise Stock Balance"] = {
|
|||||||
"options": "Company",
|
"options": "Company",
|
||||||
"reqd": 1,
|
"reqd": 1,
|
||||||
"default": frappe.defaults.get_user_default("Company")
|
"default": frappe.defaults.get_user_default("Company")
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"show_disabled_warehouses",
|
||||||
|
"label": __("Show Disabled Warehouses"),
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"default": 0
|
||||||
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"initial_depth": 3,
|
"initial_depth": 3,
|
||||||
|
@ -11,6 +11,7 @@ from frappe.query_builder.functions import Sum
|
|||||||
class StockBalanceFilter(TypedDict):
|
class StockBalanceFilter(TypedDict):
|
||||||
company: Optional[str]
|
company: Optional[str]
|
||||||
warehouse: Optional[str]
|
warehouse: Optional[str]
|
||||||
|
show_disabled_warehouses: Optional[int]
|
||||||
|
|
||||||
|
|
||||||
SLEntry = Dict[str, Any]
|
SLEntry = Dict[str, Any]
|
||||||
@ -18,7 +19,7 @@ SLEntry = Dict[str, Any]
|
|||||||
|
|
||||||
def execute(filters=None):
|
def execute(filters=None):
|
||||||
columns, data = [], []
|
columns, data = [], []
|
||||||
columns = get_columns()
|
columns = get_columns(filters)
|
||||||
data = get_data(filters)
|
data = get_data(filters)
|
||||||
|
|
||||||
return columns, data
|
return columns, data
|
||||||
@ -42,10 +43,14 @@ def get_warehouse_wise_balance(filters: StockBalanceFilter) -> List[SLEntry]:
|
|||||||
|
|
||||||
|
|
||||||
def get_warehouses(report_filters: StockBalanceFilter):
|
def get_warehouses(report_filters: StockBalanceFilter):
|
||||||
|
filters = {"company": report_filters.company, "disabled": 0}
|
||||||
|
if report_filters.get("show_disabled_warehouses"):
|
||||||
|
filters["disabled"] = ("in", [0, report_filters.show_disabled_warehouses])
|
||||||
|
|
||||||
return frappe.get_all(
|
return frappe.get_all(
|
||||||
"Warehouse",
|
"Warehouse",
|
||||||
fields=["name", "parent_warehouse", "is_group"],
|
fields=["name", "parent_warehouse", "is_group", "disabled"],
|
||||||
filters={"company": report_filters.company},
|
filters=filters,
|
||||||
order_by="lft",
|
order_by="lft",
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -90,8 +95,8 @@ def set_balance_in_parent(warehouses):
|
|||||||
update_balance(warehouse, warehouse.stock_balance)
|
update_balance(warehouse, warehouse.stock_balance)
|
||||||
|
|
||||||
|
|
||||||
def get_columns():
|
def get_columns(filters: StockBalanceFilter) -> List[Dict]:
|
||||||
return [
|
columns = [
|
||||||
{
|
{
|
||||||
"label": _("Warehouse"),
|
"label": _("Warehouse"),
|
||||||
"fieldname": "name",
|
"fieldname": "name",
|
||||||
@ -101,3 +106,15 @@ def get_columns():
|
|||||||
},
|
},
|
||||||
{"label": _("Stock Balance"), "fieldname": "stock_balance", "fieldtype": "Float", "width": 150},
|
{"label": _("Stock Balance"), "fieldname": "stock_balance", "fieldtype": "Float", "width": 150},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if filters.get("show_disabled_warehouses"):
|
||||||
|
columns.append(
|
||||||
|
{
|
||||||
|
"label": _("Warehouse Disabled?"),
|
||||||
|
"fieldname": "disabled",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"width": 200,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return columns
|
||||||
|
Loading…
Reference in New Issue
Block a user