Merge branch 'develop' into currency-exchange-settings

2021-11-06 09:59:00 +05:30
parent 4716523c77 aed45f22f4
commit 01e7076b65
1978 changed files with 192 additions and 3553 deletions
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -1,7 +1,6 @@
 # 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
 from frappe import _