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

[Fix] Warehouse wise item balance age and value report not working (#16258)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-12-24 14:19:27 +05:30 committed by Rushabh Mehta
parent 3ae2517867
commit 1c1798c7f2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
View File

@ -10,7 +10,7 @@ frappe.query_reports["Warehouse wise Item Balance Age and Value"] = {
"fieldtype": "Date", "fieldtype": "Date",
"width": "80", "width": "80",
"reqd": 1, "reqd": 1,
"default": frappe.sys_defaults.year_start_date, "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
}, },
{ {
"fieldname":"to_date", "fieldname":"to_date",

15
erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
View File

@ -8,7 +8,8 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import flt, cint, getdate 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 erpnext.stock.report.stock_ageing.stock_ageing import get_fifo_queue, get_average_age
from six import iteritems from six import iteritems
@ -18,8 +19,12 @@ def execute(filters=None):
validate_filters(filters) validate_filters(filters)
columns = get_columns(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) warehouse_list = get_warehouse_list(filters)
item_ageing = get_fifo_queue(filters) item_ageing = get_fifo_queue(filters)
data = [] data = []
@ -27,6 +32,8 @@ def execute(filters=None):
item_value = {} item_value = {}
for (company, item, warehouse) in sorted(iwb_map): for (company, item, warehouse) in sorted(iwb_map):
if not item_map.get(item): continue
row = [] row = []
qty_dict = iwb_map[(company, item, warehouse)] qty_dict = iwb_map[(company, item, warehouse)]
item_balance.setdefault((item, item_map[item]["item_group"]), []) item_balance.setdefault((item, item_map[item]["item_group"]), [])
@ -42,6 +49,8 @@ def execute(filters=None):
# sum bal_qty by item # sum bal_qty by item
for (item, item_group), wh_balance in iteritems(item_balance): 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)]) total_stock_value = sum(item_value[(item, item_group)])
row = [item, item_group, total_stock_value] row = [item, item_group, total_stock_value]