Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop

2021-09-02 18:59:59 +05:30
parent e8a5dc371b eec40513be
commit c85242e03d
2163 changed files with 15908 additions and 5486 deletions
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 from frappe import _

 app_name = "erpnext"