schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tax amount conversion in client side printing

Browse Source
This commit is contained in:
Nabin Hait
2015-02-23 01:12:09 +05:30
parent de9c8a9028
commit 755ff60313
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/public/js/controllers/accounts.js
View File

@@ -100,11 +100,6 @@ cur_frm.pformat.taxes= function(doc){
+ format_currency(val, doc.currency) + '</td></tr>'; + format_currency(val, doc.currency) + '</td></tr>';
} }
function convert_rate(val) {
var new_val = flt(val)/flt(doc.conversion_rate);
return new_val;
}
function print_hide(fieldname) { function print_hide(fieldname) {
var doc_field = frappe.meta.get_docfield(doc.doctype, fieldname, doc.name); var doc_field = frappe.meta.get_docfield(doc.doctype, fieldname, doc.name);
return doc_field.print_hide; return doc_field.print_hide;
@@ -132,8 +127,8 @@ cur_frm.pformat.taxes= function(doc){
// add rows // add rows
if(cl.length){ if(cl.length){
for(var i=0;i<cl.length;i++) { for(var i=0;i<cl.length;i++) {
if(convert_rate(cl[i].tax_amount)!=0 && !cl[i].included_in_print_rate) if(cl[i].tax_amount!=0 && !cl[i].included_in_print_rate)
out += make_row(cl[i].description, convert_rate(cl[i].tax_amount), 0); out += make_row(cl[i].description, cl[i].tax_amount, 0);
} }
} }