Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.7.1'
+__version__ = '5.7.2'

erpnext/hooks.py

@@ -27,7 +27,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "5.7.1"
+app_version = "5.7.2"
 github_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/patches/v4_2/repost_reserved_qty.py

@@ -18,10 +18,18 @@ def execute():
 					select distinct item_code, warehouse 
 					from `tabPacked Item` where docstatus=1 and parenttype='Sales Order'
 				)
-			) items
+			) so_item
+		where
+			exists(select name from tabItem where name=so_item.item_code and ifnull(is_stock_item, 0)=1)
 	""")
-	
+
 	for item_code, warehouse in repost_for:
 			update_bin_qty(item_code, warehouse, {
 				"reserved_qty": get_reserved_qty(item_code, warehouse)
-			})
+			})
+			
+	frappe.db.sql("""delete from tabBin 
+		where exists(
+			select name from tabItem where name=tabBin.item_code and ifnull(is_stock_item, 0) = 0
+		)
+	""")

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.7.1"
+version = "5.7.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()