schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: group warehouse added in the stock reconciliation

Browse Source
This commit is contained in:
Rohit Waghchaure
2024-04-04 12:06:46 +05:30
parent c3b2ed57f6
commit 8f53bc0096
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -1021,7 +1021,9 @@ def get_batch_qty_for_stock_reco(item_code, warehouse, batch_no, posting_date, p
@frappe.whitelist() @frappe.whitelist()
def get_items(warehouse, posting_date, posting_time, company, item_code=None, ignore_empty_stock=False): def get_items(warehouse, posting_date, posting_time, company, item_code=None, ignore_empty_stock=False):
ignore_empty_stock = cint(ignore_empty_stock) ignore_empty_stock = cint(ignore_empty_stock)
items = [frappe._dict({"item_code": item_code, "warehouse": warehouse})] items = []
if item_code and warehouse:
items = get_item_and_warehouses(item_code, warehouse)
if not item_code: if not item_code:
items = get_items_for_stock_reco(warehouse, company) items = get_items_for_stock_reco(warehouse, company)
@@ -1066,6 +1068,20 @@ def get_items(warehouse, posting_date, posting_time, company, item_code=None, ig
return res return res
def get_item_and_warehouses(item_code, warehouse):
from frappe.utils.nestedset import get_descendants_of
items = []
if frappe.get_cached_value("Warehouse", warehouse, "is_group"):
childrens = get_descendants_of("Warehouse", warehouse, ignore_permissions=True, order_by="lft")
for ch_warehouse in childrens:
items.append(frappe._dict({"item_code": item_code, "warehouse": ch_warehouse}))
else:
items = [frappe._dict({"item_code": item_code, "warehouse": warehouse})]
return items
def get_items_for_stock_reco(warehouse, company): def get_items_for_stock_reco(warehouse, company):
lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"]) lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
items = frappe.db.sql( items = frappe.db.sql(
@@ -1080,7 +1096,7 @@ def get_items_for_stock_reco(warehouse, company):
and i.is_stock_item = 1 and i.is_stock_item = 1
and i.has_variants = 0 and i.has_variants = 0
and exists( and exists(
select name from `tabWarehouse` where lft >= {lft} and rgt <= {rgt} and name = bin.warehouse select name from `tabWarehouse` where lft >= {lft} and rgt <= {rgt} and name = bin.warehouse and is_group = 0
) )
""", """,
as_dict=1, as_dict=1,
@@ -1095,7 +1111,7 @@ def get_items_for_stock_reco(warehouse, company):
where where
i.name = id.parent i.name = id.parent
and exists( and exists(
select name from `tabWarehouse` where lft >= %s and rgt <= %s and name=id.default_warehouse select name from `tabWarehouse` where lft >= %s and rgt <= %s and name=id.default_warehouse and is_group = 0
) )
and i.is_stock_item = 1 and i.is_stock_item = 1
and i.has_variants = 0 and i.has_variants = 0
@@ -1157,7 +1173,7 @@ def get_itemwise_batch(warehouse, posting_date, company, item_code=None):
frappe._dict( frappe._dict(
{ {
"item_code": row[0], "item_code": row[0],
"warehouse": warehouse, "warehouse": row[3],
"qty": row[8], "qty": row[8],
"item_name": row[1], "item_name": row[1],
"batch_no": row[4], "batch_no": row[4],