nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 08:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Reserved and ordered qty fix for drop ship orders

Browse Source
This commit is contained in:
Saurabh
2015-11-18 17:03:33 +05:30
parent a4bf02de6c
commit 2e292060c5
9 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/stock_balance.py
View File

@@ -76,10 +76,12 @@ def get_reserved_qty(item_code, warehouse):
(
select qty from `tabSales Order Item`
where name = dnpi.parent_detail_docname
and (delivered_by_supplier is null or delivered_by_supplier = 0)
) as so_item_qty,
(
select ifnull(delivered_qty, 0) from `tabSales Order Item`
where name = dnpi.parent_detail_docname
where name = dnpi.parent_detail_docname
and (delivered_by_supplier is null or delivered_by_supplier = 0)
) as so_item_delivered_qty,
parent, name
from
@@ -96,7 +98,8 @@ def get_reserved_qty(item_code, warehouse):
(select qty as dnpi_qty, qty as so_item_qty,
ifnull(delivered_qty, 0) as so_item_delivered_qty, parent, name
from `tabSales Order Item` so_item
where item_code = %s and warehouse = %s
where item_code = %s and warehouse = %s
and (so_item.delivered_by_supplier is null or so_item.delivered_by_supplier = 0)
and exists(select * from `tabSales Order` so
where so.name = so_item.parent and so.docstatus = 1
and so.status not in ('Stopped','Closed')))
@@ -122,7 +125,9 @@ def get_ordered_qty(item_code, warehouse):
from `tabPurchase Order Item` po_item, `tabPurchase Order` po
where po_item.item_code=%s and po_item.warehouse=%s
and po_item.qty > ifnull(po_item.received_qty, 0) and po_item.parent=po.name
and po.status not in ('Stopped', 'Closed', 'Delivered') and po.docstatus=1""", (item_code, warehouse))
and po.status not in ('Stopped', 'Closed', 'Delivered') and po.docstatus=1
and (po_item.delivered_by_supplier is null or po_item.delivered_by_supplier = 0)
""", (item_code, warehouse))
return flt(ordered_qty[0][0]) if ordered_qty else 0