Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] [fix] net_total_export printing and hover effect for brand in navbar

Browse Source
This commit is contained in:
Anand Doshi 2013-07-18 18:15:56 +05:30
parent a45d164140
commit c8b2c0f091
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
View File

@ -25,7 +25,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
} }
// For customizing print // For customizing print
cur_frm.pformat.net_total = function(doc) { cur_frm.pformat.net_total_export = function(doc) {
return ''; return '';
} }
@ -70,8 +70,8 @@ cur_frm.pformat.other_charges= function(doc){
// main table // main table
out +='<table class="noborder" style="width:100%">'; out +='<table class="noborder" style="width:100%">';
if(!print_hide('net_total')) { if(!print_hide('net_total_export')) {
out +=make_row('Net Total',convert_rate(doc.net_total),1); out += make_row('Net Total', doc.net_total_export, 1);
} }
// add rows // add rows

11
public/js/conf.js
View File

@ -15,13 +15,8 @@ wn.modules_path = 'erpnext';
// add toolbar icon // add toolbar icon
$(document).bind('toolbar_setup', function() { $(document).bind('toolbar_setup', function() {
$('.navbar-brand').html('<object data="app/images/splash.svg" \ $('.navbar-brand').html('<img src="app/images/splash.svg" class="toolbar-splash">' +
class="toolbar-splash" type="image/svg+xml"></object>' +
(wn.boot.website_settings.brand_html || 'erpnext')) (wn.boot.website_settings.brand_html || 'erpnext'))
.css('max-width', '200px').css('overflow', 'hidden') .addClass("navbar-icon-home")
.hover(function() { .css('max-width', '200px').css('overflow', 'hidden');
$(this).find('.icon-home').addClass('navbar-icon-home-hover');
}, function() {
$(this).find('.icon-home').removeClass('navbar-icon-home-hover');
});
}); });