Merge branch 'edge'
This commit is contained in:
commit
9cf478618f
@ -1,4 +1,10 @@
|
||||
erpnext.updates = [
|
||||
["6th February, 2013", [
|
||||
"Bookmarks: Add bookmarks via toolbar by clicking on the <i class='icon-star'></i> sign.",
|
||||
]],
|
||||
["5th February, 2013", [
|
||||
"Holiday Block List: Block users from taking leave on certain days.",
|
||||
]],
|
||||
["2nd February, 2013", [
|
||||
"Warehouse: Added table Warehouse User to restrict Warehouse Entry per user.",
|
||||
]],
|
||||
|
@ -51,7 +51,8 @@ erpnext.toolbar.setup = function() {
|
||||
erpnext.toolbar.add_modules = function() {
|
||||
$('<li class="dropdown">\
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"\
|
||||
onclick="return false;">'+wn._('Modules')+'<b class="caret"></b></a>\
|
||||
title="'+wn._("Modules")+'"\
|
||||
onclick="return false;"><i class="icon-th"></i> <b class="caret"></b></a>\
|
||||
<ul class="dropdown-menu modules">\
|
||||
</ul>\
|
||||
</li>').prependTo('.navbar .nav:first');
|
||||
|
Loading…
Reference in New Issue
Block a user