diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
index 4430960664..eca6eaea5d 100644
--- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
+++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
@@ -25,7 +25,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
}
// For customizing print
-cur_frm.pformat.net_total = function(doc) {
+cur_frm.pformat.net_total_export = function(doc) {
return '';
}
@@ -70,8 +70,8 @@ cur_frm.pformat.other_charges= function(doc){
// main table
out +='
';
- if(!print_hide('net_total')) {
- out +=make_row('Net Total',convert_rate(doc.net_total),1);
+ if(!print_hide('net_total_export')) {
+ out += make_row('Net Total', doc.net_total_export, 1);
}
// add rows
diff --git a/public/js/conf.js b/public/js/conf.js
index 57f4b442bf..19d8c3bcb2 100644
--- a/public/js/conf.js
+++ b/public/js/conf.js
@@ -15,13 +15,8 @@ wn.modules_path = 'erpnext';
// add toolbar icon
$(document).bind('toolbar_setup', function() {
- $('.navbar-brand').html('' +
+ $('.navbar-brand').html('
' +
(wn.boot.website_settings.brand_html || 'erpnext'))
- .css('max-width', '200px').css('overflow', 'hidden')
- .hover(function() {
- $(this).find('.icon-home').addClass('navbar-icon-home-hover');
- }, function() {
- $(this).find('.icon-home').removeClass('navbar-icon-home-hover');
- });
+ .addClass("navbar-icon-home")
+ .css('max-width', '200px').css('overflow', 'hidden');
});