commit 4e08dfc72f608e32dc09c7c9de9e9cb9b1e5a206
author mbauskar <mbauskar@gmail.com> Thu Jun 29 21:58:08 2017 +0530
committer mbauskar <mbauskar@gmail.com> Thu Jun 29 21:58:08 2017 +0530
tree 1a316e9debfafcd3185361ece601cc5d5001c48e
parent 1508267fd6fc532d553c95bf8a2b7c99b2fbac00
parent 53e34f5c1c445f8f0c32b3d22ad0047caec09381

Merge branch 'develop'

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 32c9719..dd95aaf 100644
--- a/erpnext/__init__.py
+++ b/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

diff --git a/erpnext/patches/v8_1/delete_deprecated_reports.py b/erpnext/patches/v8_1/delete_deprecated_reports.py
index 9047d84..887277a 100644
--- a/erpnext/patches/v8_1/delete_deprecated_reports.py
+++ b/erpnext/patches/v8_1/delete_deprecated_reports.py
@@ -35,7 +35,7 @@
 	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])
 			)
 		)