diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js index 21884d89d1..39cfd7274f 100644 --- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js +++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js @@ -10,7 +10,7 @@ frappe.query_reports["Warehouse wise Item Balance Age and Value"] = { "fieldtype": "Date", "width": "80", "reqd": 1, - "default": frappe.sys_defaults.year_start_date, + "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1), }, { "fieldname":"to_date", diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py index 676cf54d8e..318a8e0714 100644 --- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py +++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py @@ -8,7 +8,8 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import flt, cint, getdate -from erpnext.stock.report.stock_balance.stock_balance import get_item_details, get_item_reorder_details, get_item_warehouse_map +from erpnext.stock.report.stock_balance.stock_balance import (get_item_details, + get_item_reorder_details, get_item_warehouse_map, get_items, get_stock_ledger_entries) from erpnext.stock.report.stock_ageing.stock_ageing import get_fifo_queue, get_average_age from six import iteritems @@ -18,8 +19,12 @@ def execute(filters=None): validate_filters(filters) columns = get_columns(filters) - item_map = get_item_details(filters) - iwb_map = get_item_warehouse_map(filters) + + items = get_items(filters) + sle = get_stock_ledger_entries(filters, items) + + item_map = get_item_details(items, sle, filters) + iwb_map = get_item_warehouse_map(filters, sle) warehouse_list = get_warehouse_list(filters) item_ageing = get_fifo_queue(filters) data = [] @@ -27,6 +32,8 @@ def execute(filters=None): item_value = {} for (company, item, warehouse) in sorted(iwb_map): + if not item_map.get(item): continue + row = [] qty_dict = iwb_map[(company, item, warehouse)] item_balance.setdefault((item, item_map[item]["item_group"]), []) @@ -42,6 +49,8 @@ def execute(filters=None): # sum bal_qty by item for (item, item_group), wh_balance in iteritems(item_balance): + if not item_ageing.get(item): continue + total_stock_value = sum(item_value[(item, item_group)]) row = [item, item_group, total_stock_value]