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

fix: Stock Analytics Report must consider warehouse during calculation

Browse Source
This commit is contained in:
marination 2021-07-27 16:53:55 +05:30
parent 6d61340039
commit 55d8aaf0b6
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
erpnext/stock/report/stock_analytics/stock_analytics.py
View File

@ -114,14 +114,41 @@ def get_period(posting_date, filters):
def get_periodic_data(entry, filters): def get_periodic_data(entry, filters):
"""Structured as:
Item 1
- Balance (updated and carried forward):
- Warehouse A : bal_qty/value
- Warehouse B : bal_qty/value
- Jun 2021 (sum of warehouse quantities used in report)
- Warehouse A : bal_qty/value
- Warehouse B : bal_qty/value
- Jul 2021 (sum of warehouse quantities used in report)
- Warehouse A : bal_qty/value
- Warehouse B : bal_qty/value
Item 2
- Balance (updated and carried forward):
- Warehouse A : bal_qty/value
- Warehouse B : bal_qty/value
- Jun 2021 (sum of warehouse quantities used in report)
- Warehouse A : bal_qty/value
- Warehouse B : bal_qty/value
- Jul 2021 (sum of warehouse quantities used in report)
- Warehouse A : bal_qty/value
- Warehouse B : bal_qty/value
"""
periodic_data = {} periodic_data = {}
for d in entry: for d in entry:
period = get_period(d.posting_date, filters) period = get_period(d.posting_date, filters)
bal_qty = 0 bal_qty = 0
# if period against item does not exist yet, instantiate it
# insert existing balance dict against period, and add/subtract to it
if periodic_data.get(d.item_code) and not periodic_data.get(d.item_code).get(period):
periodic_data[d.item_code][period] = periodic_data[d.item_code]['balance']
if d.voucher_type == "Stock Reconciliation": if d.voucher_type == "Stock Reconciliation":
if periodic_data.get(d.item_code): if periodic_data.get(d.item_code) and periodic_data.get(d.item_code).get('balance').get(d.warehouse):
bal_qty = periodic_data[d.item_code]["balance"] bal_qty = periodic_data[d.item_code]['balance'][d.warehouse]
qty_diff = d.qty_after_transaction - bal_qty qty_diff = d.qty_after_transaction - bal_qty
else: else:
@ -132,12 +159,12 @@ def get_periodic_data(entry, filters):
else: else:
value = d.stock_value_difference value = d.stock_value_difference
periodic_data.setdefault(d.item_code, {}).setdefault(period, 0.0) # period-warehouse wise balance
periodic_data.setdefault(d.item_code, {}).setdefault("balance", 0.0) periodic_data.setdefault(d.item_code, {}).setdefault('balance', {}).setdefault(d.warehouse, 0.0)
periodic_data.setdefault(d.item_code, {}).setdefault(period, {}).setdefault(d.warehouse, 0.0)
periodic_data[d.item_code]["balance"] += value
periodic_data[d.item_code][period] = periodic_data[d.item_code]["balance"]
periodic_data[d.item_code]['balance'][d.warehouse] += value
periodic_data[d.item_code][period][d.warehouse] = periodic_data[d.item_code]['balance'][d.warehouse]
return periodic_data return periodic_data
@ -160,7 +187,8 @@ def get_data(filters):
total = 0 total = 0
for dummy, end_date in ranges: for dummy, end_date in ranges:
period = get_period(end_date, filters) period = get_period(end_date, filters)
amount = flt(periodic_data.get(item_data.name, {}).get(period)) period_data = periodic_data.get(item_data.name, {}).get(period)
amount = sum(period_data.values()) if period_data else 0
row[scrub(period)] = amount row[scrub(period)] = amount
total += amount total += amount
row["total"] = total row["total"] = total