Merge branch 'develop'

erpnext/__init__.py

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

erpnext/accounts/page/pos/pos.js

@@ -1484,7 +1484,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	print_dialog: function () {
 		var me = this;
 
-		this.frappe.msgprint = frappe.msgprint(
+		this.msgprint = frappe.msgprint(
 			`<a class="btn btn-primary print_doc"
 				style="margin-right: 5px;">${__('Print')}</a>
 			<a class="btn btn-default new_doc">${__('New')}</a>`);
@@ -1495,7 +1495,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		})
 
 		$('.new_doc').click(function () {
-			me.frappe.msgprint.hide()
+			me.msgprint.hide()
 			me.make_new_cart()
 		})
 	},

erpnext/crm/doctype/lead/lead.json

@@ -1144,7 +1144,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-13 14:29:12.567700", 
+ "modified": "2017-06-22 14:29:12.700000", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Lead", 

erpnext/patches.txt

@@ -405,4 +405,5 @@ erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
 erpnext.patches.v8_0.change_in_words_varchar_length
 erpnext.patches.v8_0.create_domain_docs	#16-05-2017
 erpnext.patches.v8_0.update_sales_cost_in_project
-erpnext.patches.v8_0.save_system_settings
+erpnext.patches.v8_0.save_system_settings
+erpnext.patches.v8_1.delete_deprecated_reports

erpnext/patches/v8_1/delete_deprecated_reports.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	""" delete deprecated reports """
+
+	reports = ["Monthly Salary Register", "Customer Addresses And Contacts",
+		"Supplier Addresses And Contacts"]
+
+	for report in reports:
+		if frappe.db.exists("Report", report):
+			frappe.delete_doc("Report", report, ignore_permissions=True)