mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-20 05:29:18 +00:00
fix: don't reserve qty on sales return.
This commit is contained in:
@@ -97,7 +97,7 @@ def get_reserved_qty(item_code, warehouse):
|
|||||||
reserved_qty = frappe.db.sql(
|
reserved_qty = frappe.db.sql(
|
||||||
"""
|
"""
|
||||||
select
|
select
|
||||||
sum(dnpi_qty * ((so_item_qty - so_item_delivered_qty) / so_item_qty))
|
sum(dnpi_qty * ((so_item_qty - so_item_delivered_qty - so_item_returned_qty) / so_item_qty))
|
||||||
from
|
from
|
||||||
(
|
(
|
||||||
(select
|
(select
|
||||||
@@ -112,6 +112,11 @@ def get_reserved_qty(item_code, warehouse):
|
|||||||
where name = dnpi.parent_detail_docname
|
where name = dnpi.parent_detail_docname
|
||||||
and delivered_by_supplier = 0
|
and delivered_by_supplier = 0
|
||||||
) as so_item_delivered_qty,
|
) as so_item_delivered_qty,
|
||||||
|
(
|
||||||
|
select returned_qty from `tabSales Order Item`
|
||||||
|
where name = dnpi.parent_detail_docname
|
||||||
|
and delivered_by_supplier = 0
|
||||||
|
) as so_item_returned_qty,
|
||||||
parent, name
|
parent, name
|
||||||
from
|
from
|
||||||
(
|
(
|
||||||
@@ -125,7 +130,8 @@ def get_reserved_qty(item_code, warehouse):
|
|||||||
) dnpi)
|
) dnpi)
|
||||||
union
|
union
|
||||||
(select stock_qty as dnpi_qty, qty as so_item_qty,
|
(select stock_qty as dnpi_qty, qty as so_item_qty,
|
||||||
delivered_qty as so_item_delivered_qty, parent, name
|
delivered_qty as so_item_delivered_qty,
|
||||||
|
returned_qty as so_item_returned_qty, parent, name
|
||||||
from `tabSales Order Item` so_item
|
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 (so_item.delivered_by_supplier is null or so_item.delivered_by_supplier = 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user