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

chore: add Stock Reservation Qty column in Stock Balance Report

Browse Source
This commit is contained in:
s-aga-r 2023-03-27 21:03:35 +05:30
parent 3d75e3f434
commit beb425e1ff
3 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
View File

@ -181,3 +181,28 @@ def get_stock_reservation_entries_for_items(
sre_details = {d.name: d for d in sre_data}
return sre_details
def get_sre_reserved_qty_details(item_code_list: list, warehouse_list: list) -> dict:
sre_details = {}
if item_code_list and warehouse_list:
sre = frappe.qb.DocType("Stock Reservation Entry")
sre_data = (
frappe.qb.from_(sre)
.select(
sre.item_code, sre.warehouse, Sum(sre.reserved_qty - sre.delivered_qty).as_("reserved_qty")
)
.where(
(sre.docstatus == 1)
& (sre.item_code.isin(item_code_list))
& (sre.warehouse.isin(warehouse_list))
& (sre.status.notin(["Delivered", "Cancelled"]))
)
.groupby(sre.item_code, sre.warehouse)
).run(as_dict=True)
if sre_data:
sre_details = {(d["item_code"], d["warehouse"]): d["reserved_qty"] for d in sre_data}
return sre_details

22
erpnext/stock/report/stock_balance/stock_balance.py
View File

@ -58,6 +58,7 @@ def execute(filters: Optional[StockBalanceFilter] = None):
return columns, []
iwb_map = get_item_warehouse_map(filters, sle)
sre_details = get_sre_reserved_qty_details(iwb_map)
item_map = get_item_details(items, sle, filters)
item_reorder_detail_map = get_item_reorder_details(item_map.keys())
@ -88,6 +89,7 @@ def execute(filters: Optional[StockBalanceFilter] = None):
"company": company,
"reorder_level": item_reorder_level,
"reorder_qty": item_reorder_qty,
"stock_reservation_qty": sre_details.get((item, warehouse), 0.0),
}
report_data.update(item_map[item])
report_data.update(qty_dict)
@ -229,6 +231,13 @@ def get_columns(filters: StockBalanceFilter):
"width": 80,
"convertible": "qty",
},
{
"label": _("Stock Reservation Qty"),
"fieldname": "stock_reservation_qty",
"fieldtype": "Float",
"width": 80,
"convertible": "qty",
},
{
"label": _("Company"),
"fieldname": "company",
@ -388,6 +397,19 @@ def get_item_warehouse_map(filters: StockBalanceFilter, sle: List[SLEntry]):
return iwb_map
def get_sre_reserved_qty_details(iwb_map: list) -> dict:
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
get_sre_reserved_qty_details as get_reserved_qty_details,
)
item_code_list, warehouse_list = [], []
for d in iwb_map:
item_code_list.append(d[1])
warehouse_list.append(d[2])
return get_reserved_qty_details(item_code_list, warehouse_list)
def get_group_by_key(row, filters, inventory_dimension_fields) -> tuple:
group_by_key = [row.company, row.item_code, row.warehouse]

34
erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
View File

@ -4,7 +4,6 @@
import frappe
from frappe import _
from frappe.query_builder.functions import Sum
from frappe.utils import flt, today
from pypika.terms import ExistsCriterion
@ -275,33 +274,16 @@ def get_bin_list(filters):
def get_sre_reserved_qty_details(bin_list: list) -> dict:
sre_details = {}
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
get_sre_reserved_qty_details as get_reserved_qty_details,
)
if bin_list:
item_code_list, warehouse_list = [], []
for bin in bin_list:
item_code_list.append(bin["item_code"])
warehouse_list.append(bin["warehouse"])
item_code_list, warehouse_list = [], []
for bin in bin_list:
item_code_list.append(bin["item_code"])
warehouse_list.append(bin["warehouse"])
sre = frappe.qb.DocType("Stock Reservation Entry")
sre_data = (
frappe.qb.from_(sre)
.select(
sre.item_code, sre.warehouse, Sum(sre.reserved_qty - sre.delivered_qty).as_("reserved_qty")
)
.where(
(sre.docstatus == 1)
& (sre.item_code.isin(item_code_list))
& (sre.warehouse.isin(warehouse_list))
& (sre.status.notin(["Delivered", "Cancelled"]))
)
.groupby(sre.item_code, sre.warehouse)
).run(as_dict=True)
if sre_data:
sre_details = {(d["item_code"], d["warehouse"]): d["reserved_qty"] for d in sre_data}
return sre_details
return get_reserved_qty_details(item_code_list, warehouse_list)
def get_item_map(item_code, include_uom):