Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.16.3'
+__version__ = '6.16.4'

erpnext/hooks.py

@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.16.3"
+app_version = "6.16.4"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/patches/v4_2/repost_reserved_qty.py

@@ -6,16 +6,18 @@ import frappe
 from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
 
 def execute():
+	frappe.reload_doctype("Sales Order Item")
+
 	repost_for = frappe.db.sql("""
-		select 
+		select
-			distinct item_code, warehouse 
+			distinct item_code, warehouse
-		from 
+		from
 			(
 				(
-					select distinct item_code, warehouse 
+					select distinct item_code, warehouse
 								from `tabSales Order Item` where docstatus=1
 				) UNION (
-					select distinct item_code, warehouse 
+					select distinct item_code, warehouse
 					from `tabPacked Item` where docstatus=1 and parenttype='Sales Order'
 				)
 			) so_item
@@ -27,9 +29,9 @@ def execute():
 			update_bin_qty(item_code, warehouse, {
 				"reserved_qty": get_reserved_qty(item_code, warehouse)
 			})
-			
+
-	frappe.db.sql("""delete from tabBin 
+	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,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.16.3"
+version = "6.16.4"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(