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

fixes in checking print_hide property in standard print format

Browse Source
This commit is contained in:
Nabin Hait 2013-04-01 12:18:36 +05:30
parent d270559fa9
commit 1013e77957
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,16 +53,14 @@ cur_frm.pformat.other_charges= function(doc){
var new_val = flt(val)/flt(doc.conversion_rate); var new_val = flt(val)/flt(doc.conversion_rate);
return new_val; return new_val;
} }
out ='';
if (!doc.print_without_amount) { function print_hide(fieldname) {
print_hide_dict = {}; var doc_field = wn.meta.get_docfield(doc.doctype, fieldname, doc.name);
for(var i in locals['DocField']) { return doc_field.print_hide;
var doc_field = locals['DocField'][i];
if(doc_field.fieldname) {
print_hide_dict[doc_field.fieldname] = doc_field.print_hide;
}
} }
out ='';
if (!doc.print_without_amount) {
var cl = getchildren('Sales Taxes and Charges',doc.name,'other_charges'); var cl = getchildren('Sales Taxes and Charges',doc.name,'other_charges');
// outer table // outer table
@ -71,7 +69,7 @@ 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_dict['net_total']) { if(!print_hide('net_total')) {
out +=make_row('Net Total',convert_rate(doc.net_total),1); out +=make_row('Net Total',convert_rate(doc.net_total),1);
} }
@ -84,15 +82,15 @@ cur_frm.pformat.other_charges= function(doc){
} }
// grand total // grand total
if(!print_hide_dict['grand_total_export']) { if(!print_hide('grand_total_export')) {
out += make_row('Grand Total',doc.grand_total_export,1); out += make_row('Grand Total',doc.grand_total_export,1);
} }
if(!print_hide_dict['rounded_total_export']) { if(!print_hide('rounded_total_export')) {
out += make_row('Rounded Total',doc.rounded_total_export,1); out += make_row('Rounded Total',doc.rounded_total_export,1);
} }
if(doc.in_words_export && !print_hide_dict['in_words_export']){ if(doc.in_words_export && !print_hide('in_words_export')){
out +='</table></td></tr>'; out +='</table></td></tr>';
out += '<tr><td colspan = "2">'; out += '<tr><td colspan = "2">';
out += '<table><tr><td style="width:25%;"><b>In Words</b></td>' out += '<table><tr><td style="width:25%;"><b>In Words</b></td>'