Merge branch 'develop' into website_theme_scss
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index f8b6be7..1948e45 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -23,7 +23,6 @@
doctype_js = {
"Communication": "public/js/communication.js",
"Event": "public/js/event.js",
- "Website Theme": "public/js/website_theme.js",
"Newsletter": "public/js/newsletter.js"
}
diff --git a/erpnext/public/js/website_theme.js b/erpnext/public/js/website_theme.js
deleted file mode 100644
index 9662f78..0000000
--- a/erpnext/public/js/website_theme.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.form.on('Website Theme', {
- validate(frm) {
- let theme_scss = frm.doc.theme_scss;
- if (theme_scss && (theme_scss.includes('frappe/public/scss/website')
- && !theme_scss.includes('erpnext/public/scss/website'))
- ) {
- frm.set_value('theme_scss',
- `${frm.doc.theme_scss}\n@import "erpnext/public/scss/website";`);
- }
- }
-});