Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.6.0'
+__version__ = '5.6.1'

erpnext/hooks.py

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

erpnext/patches/v5_4/stock_entry_additional_costs.py

@@ -17,7 +17,8 @@ def execute():
 	""")
 
 	stock_entries = frappe.db.sql_list("""select name from `tabStock Entry`
-		where purpose in ('Manufacture', 'Repack') and ifnull(additional_operating_cost, 0)!=0""")
+		where purpose in ('Manufacture', 'Repack') and ifnull(additional_operating_cost, 0)!=0
+		and docstatus < 2""")
 
 	for d in stock_entries:
 		stock_entry = frappe.get_doc("Stock Entry", d)

setup.py

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