sync_handler_merge
diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js
index 7852ab2..93acd08 100644
--- a/erpnext/home/page/desktop/desktop.js
+++ b/erpnext/home/page/desktop/desktop.js
@@ -79,7 +79,7 @@
for(var i in wn.boot.modules_list) {
var m = wn.boot.modules_list[i];
- if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1)
+ if(!in_list(['Setup', 'Dashboard'], m) && wn.boot.profile.allow_modules.indexOf(m)!=-1)
add_icon(m);
}
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index 925c85e..27befaf 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -64,6 +64,10 @@
// always allow apps
wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat(
['To Do', 'Knowledge Base', 'Calendar', 'Activity', 'Messages'])
+ // allow dashboard to accounts manager
+ if(user_roles.indexOf('Accounts Manager')!=-1) {
+ wn.boot.profile.allow_modules.push('Dashboard');
+ }
// setup toolbar
erpnext.toolbar.setup();
diff --git a/js/all-app.js b/js/all-app.js
index 925611a..bd85e3e 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -2203,6 +2203,7 @@
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
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','Messages'])
+if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');}
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();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/js/all-web.js b/js/all-web.js
index 778b45f..0f78817 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -1240,6 +1240,7 @@
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
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','Messages'])
+if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');}
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();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 a8d5481..560b9d8 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1396
\ No newline at end of file
+1401
\ No newline at end of file