nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into customer-login

Browse Source
This commit is contained in:
Anand Doshi
2013-09-03 16:42:21 +05:30
parent ddb7c8048e 4263344cd2
commit 0e23929740
134 changed files with 281 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/queries.js
View File

@@ -5,7 +5,7 @@
wn.provide("erpnext.queries");
$.extend(erpnext.queries, {
profile: function() {
return { query: "controllers.queries.profile_query" };
return { query: "core.doctype.profile.profile.profile_query" };
},
lead: function() {

14
public/js/toolbar.js
View File

@@ -20,20 +20,6 @@ erpnext.toolbar.setup = function() {
<i class="icon-fixed-width icon-comments"></i> '+wn._('Live Chat')+'</a></li>');
}
erpnext.toolbar.set_new_comments();
$("#toolbar-tools").append('<li><a href="#latest-updates">\
<i class="icon-fixed-width icon-rss"></i> Latest Updates</li>');
}
erpnext.toolbar.set_new_comments = function(new_comments) {
return;
var navbar_nc = $('.navbar-new-comments');
if(cint(new_comments)) {
navbar_nc.addClass('navbar-new-comments-true')
navbar_nc.text(new_comments);
} else {
navbar_nc.removeClass('navbar-new-comments-true');
navbar_nc.text(0);
}
}