fixed permissions
diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js
index 3aa9049..47b11e6 100644
--- a/erpnext/home/page/desktop/desktop.js
+++ b/erpnext/home/page/desktop/desktop.js
@@ -79,10 +79,13 @@
for(var i in wn.boot.modules_list) {
var m = wn.boot.modules_list[i];
- if(m!='Setup')
+ if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1)
add_icon(m);
}
+ if(user_roles.indexOf('Accounts Manager')!=-1)
+ add_icon('Dashboard')
+
if(user_roles.indexOf('System Manager')!=-1)
add_icon('Setup')
diff --git a/erpnext/startup/js/toolbar.js b/erpnext/startup/js/toolbar.js
index 1a2bfdf..7bf9c6a 100644
--- a/erpnext/startup/js/toolbar.js
+++ b/erpnext/startup/js/toolbar.js
@@ -87,7 +87,7 @@
for(var i in wn.boot.modules_list) {
var m = wn.boot.modules_list[i]
- if(m!='Setup') {
+ if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1) {
args = {
module: m,
module_page: erpnext.modules[m],
@@ -98,6 +98,12 @@
data-module="%(module)s">%(module_label)s</a></li>', args));
}
}
+
+ // dasboard for accounts system manager
+ if(user_roles.indexOf("Accounts Manager")!=-1) {
+ $('.navbar .modules').append('<li><a href="#!dashboard" \
+ data-module="Dashboard">Dashboard</a></li>');
+ }
// setup for system manager
if(user_roles.indexOf("System Manager")!=-1) {
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index ad8289e..9a281e2 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -34,7 +34,8 @@
'To Do': 'todo',
'Calendar': 'calendar',
'Messages': 'messages',
- 'Knowledge Base': 'questions'
+ 'Knowledge Base': 'questions',
+ 'Dashboard': 'dashboard'
}
erpnext.startup.set_globals = function() {
@@ -59,6 +60,10 @@
wn.title_prefix = wn.boot.website_settings.title_prefix;
}
} else {
+ // always allow apps
+ wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat(
+ ['To Do', 'Knowledge Base', 'Calendar', 'Activity'])
+
// setup toolbar
erpnext.toolbar.setup();
diff --git a/js/all-app.js b/js/all-app.js
index be01071..24bb128 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/js/all-web.js b/js/all-web.js
index cad3c77..e802a17 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -1077,12 +1077,13 @@
/*
* erpnext/startup/startup.js
*/
-var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions'}
+var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
-if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
+if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity'])
+erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
Powered by <a href="https://erpnext.com">ERPNext</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
$('#startup_div').toggle(false);}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
diff --git a/version.num b/version.num
index fc0b67d..19e03cf 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-774
\ No newline at end of file
+776
\ No newline at end of file