Merge branch 'master' into staging-fixes

2018-12-26 11:44:09 +00:00
parent 56c5d8b784 23ee3c6fbe
commit e8c2fdfb8c
13 changed files with 69 additions and 19 deletions
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -97,6 +97,9 @@ erpnext.setup.slides_settings = [
 			if (!this.values.company_abbr) {
 				return false;
 			}
+			if (this.values.company_abbr.length > 5) {
+				return false;
+			}
 			return true;
 		}
 	},