Merge branch 'staging' into develop

2018-10-04 11:51:30 +00:00
parent 36cca6a64e c6eac7c60b
commit da10f6ebd8
101 changed files with 11205 additions and 9538 deletions
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.2'
+staging_version = '11.0.3-beta.3'

 error_report_email = "support@erpnext.com"

@@ -25,6 +25,7 @@ web_include_css = "assets/css/erpnext-web.css"

 doctype_js = {
 	"Communication": "public/js/communication.js",
+	"Event": "public/js/event.js"
 }

 welcome_email = "erpnext.setup.utils.welcome_email"