Merge branch 'v4.x.x'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '4.25.0'
+__version__ = '4.25.1'

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "4.25.0"
+app_version = "4.25.1"
 
 error_report_email = "support@erpnext.com"
 

erpnext/patches/v4_2/delete_gl_entries_for_cancelled_invoices.py

@@ -8,6 +8,7 @@ def execute():
 	cancelled_invoices = frappe.db.sql_list("""select name from `tabSales Invoice` 
 		where docstatus = 2 and ifnull(update_stock, 0) = 1""")
 
-	frappe.db.sql("""delete from `tabGL Entry` 
-		where voucher_type = 'Sales Invoice' and voucher_no in (%s)""" 
-		% (', '.join(['%s']*len(cancelled_invoices))), tuple(cancelled_invoices))
+	if cancelled_invoices:
+		frappe.db.sql("""delete from `tabGL Entry` 
+			where voucher_type = 'Sales Invoice' and voucher_no in (%s)""" 
+			% (', '.join(['%s']*len(cancelled_invoices))), tuple(cancelled_invoices))

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.25.0"
+version = "4.25.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()