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

Fix: floating point issue on submission of RV and creation of GL Entry

Browse Source
This commit is contained in:
Anand Doshi
2012-01-16 16:02:47 +05:30
parent 90f6e55c29
commit 077416300e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/selling/doctype/sales_common/sales_common.js
View File

@@ -245,7 +245,7 @@ cur_frm.cscript.calc_doc_values = function(doc, cdt, cdn, tname, fname, other_fn
var inclusive_rate = 0 var inclusive_rate = 0
var d = getchildren('RV Tax Detail', doc.name, other_fname,doc.doctype); var d = getchildren('RV Tax Detail', doc.name, other_fname,doc.doctype);
for(var j = 0; j<d.length; j++){ for(var j = 0; j<d.length; j++){
other_charges_total += flt(d[j].amount); other_charges_total += flt(d[j].tax_amount);
if(d[j].included_in_print_rate) { if(d[j].included_in_print_rate) {
inclusive_rate = 1; inclusive_rate = 1;
} }
@@ -325,12 +325,15 @@ cur_frm.cscript.calc_other_charges = function(doc , tname , fname , other_fname)
tax[t].total_amount = flt(tax_amount.toFixed(2)); //stores actual tax amount in virtual field tax[t].total_amount = flt(tax_amount.toFixed(2)); //stores actual tax amount in virtual field
tax[t].total_tax_amount = flt(prev_total); //stores total amount in virtual field tax[t].total_tax_amount = flt(prev_total); //stores total amount in virtual field
tax[t].tax_amount += flt(tax_amount.toFixed(2)); tax[t].tax_amount += flt(tax_amount);
var total_amount = flt(tax_amount); //var total_amount = flt(tax_amount.toFixed(2));
total_tax_amount = flt(tax[t].total_tax_amount) + flt(total_amount); //total_tax_amount = flt(tax[t].total_tax_amount) + flt(total_amount);
set_multiple('RV Tax Detail', tax[t].name, { 'item_wise_tax_detail':tax[t].item_wise_tax_detail, 'amount':total_amount, 'total':flt((flt(total)+flt(tax[t].tax_amount)).toFixed(2))/*_tax_amount)*/}, other_fname);
set_multiple('RV Tax Detail', tax[t].name, { 'item_wise_tax_detail':tax[t].item_wise_tax_detail, 'amount':flt(tax[t].total_amount), 'total':flt((flt(total)+flt(tax[t].tax_amount)).toFixed(2))/*_tax_amount)*/}, other_fname);
//console.log("Total: " + (flt(total)+flt(tax[t].tax_amount))); //console.log("Total: " + (flt(total)+flt(tax[t].tax_amount)));
prev_total += flt(tax[t].total_amount); // for previous row total prev_total += flt(tax[t].total_amount); // for previous row total
total += flt(tax_amount); // for adding total to previous amount total += flt(tax_amount); // for adding total to previous amount