Merge branch 'develop' into fix-reserve-qty
# Conflicts:
# erpnext/patches.txt
# erpnext/public/js/utils/barcode_scanner.js
# erpnext/regional/report/gstr_1/gstr_1.py
# erpnext/stock/doctype/delivery_note/test_delivery_note.py
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index e05d1c3..cf5acbd 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -97,7 +97,7 @@
reserved_qty = frappe.db.sql(
"""
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
(
(select
@@ -112,6 +112,11 @@
where name = dnpi.parent_detail_docname
and delivered_by_supplier = 0
) 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
from
(
@@ -125,7 +130,8 @@
) dnpi)
union
(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
where item_code = %s and warehouse = %s
and (so_item.delivered_by_supplier is null or so_item.delivered_by_supplier = 0)