fix to startupjs
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index c58d378..a67a214 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -60,9 +60,9 @@
import webnotes.model.doc
bootinfo['custom_css'] = webnotes.conn.get_value('Style Settings', None, 'custom_css') or ''
+ bootinfo['website_settings'] = webnotes.model.doc.getsingle('Website Settings')
if webnotes.session['user']=='Guest':
- bootinfo['website_settings'] = webnotes.model.doc.getsingle('Website Settings')
bootinfo['website_menus'] = webnotes.conn.sql("""select label, url, custom_page,
parent_label, parentfield
from `tabTop Bar Item` where parent='Website Settings' order by idx asc""", as_dict=1)
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index 5dfd692..9ca3adc 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -215,3 +215,12 @@
}
});
}
+
+erpnext.hide_naming_series = function() {
+ if(cur_frm.fields_dict.naming_series) {
+ hide_field('naming_series');
+ if(cur_frm.doc.__islocal) {
+ unhide_field('naming_series');
+ }
+ }
+}