nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2012-12-24 18:08:16 +05:30
parent 70a3db78b7 bea0671fc0
commit a0713196d2
22 changed files with 172 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/js/toolbar.js
View File

@@ -54,16 +54,11 @@ erpnext.toolbar.add_modules = function() {
</ul>\
</li>').prependTo('.navbar .nav:first');
// if no modules list then show all
if(wn.boot.modules_list && typeof(wn.boot.modules_list) == 'string') {
wn.boot.modules_list = JSON.parse(wn.boot.modules_list);
}
else
wn.boot.modules_list = keys(wn.modules).sort();
var modules_list = wn.user.get_desktop_items();
// add to dropdown
for(var i in wn.boot.modules_list) {
var m = wn.boot.modules_list[i]
for(var i in modules_list) {
var m = modules_list[i]
if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1 && wn.modules[m]) {
args = {