Merge branch 'staging' into develop

2019-01-29 18:39:14 +05:30
parent f1ff5c24ff 3f1fb9ca7e
commit f97c5dad82
355 changed files with 6308 additions and 4924 deletions
--- a/erpnext/utilities/activation.py
+++ b/erpnext/utilities/activation.py
@@ -1,6 +1,7 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt

+from __future__ import unicode_literals
 import frappe, erpnext

 from frappe import _