Merge branch 'develop'

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.2.0'
+__version__ = '8.2.1'
 
 
 def get_default_company(user=None):

erpnext/patches/v8_1/delete_deprecated_reports.py

@@ -35,7 +35,7 @@ def check_and_update_desktop_icon_for_report(report):
 	elif report in ["Customer Addresses And Contacts", "Supplier Addresses And Contacts"]:
 		frappe.db.sql("""update `tabDesktop Icon` set _report='{value}'
 			where name in ({docnames})""".format(
-				value=report,
+				value="Addresses And Contacts",
 				docnames=",".join(["'%s'"%icon for icon in desktop_icons])
 			)
 		)