diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index 7d5fa82d5822..5139d9375ecf 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -1504,7 +1504,7 @@ for (var i=0; i 0 ? formatMoney(item.cost(), model.invoice().client().currency_id(), true) : ''); + item.cost(NINJA.parseFloat(item.cost()) > 0 ? roundToTwo(item.cost(), true) : ''); } onTaxRateChange(); diff --git a/public/built.js b/public/built.js index ba92a50b794f..e71cf85fe40d 100644 --- a/public/built.js +++ b/public/built.js @@ -39226,7 +39226,7 @@ function calculateAmounts(invoice) { total = parseFloat(total) + parseFloat(tax); } - invoice.balance_amount = roundToTwo(total) - roundToTwo(invoice.amount) - roundToTwo(invoice.balance); + invoice.balance_amount = roundToTwo(total) - (roundToTwo(invoice.amount) - roundToTwo(invoice.balance)); invoice.tax_amount = tax; invoice.discount_amount = discount; invoice.has_taxes = hasTaxes; @@ -39463,6 +39463,7 @@ function toggleDatePicker(field) { $('#'+field).datepicker('show'); } -function roundToTwo(num) { - return +(Math.round(num + "e+2") + "e-2"); +function roundToTwo(num, toString) { + var val = +(Math.round(num + "e+2") + "e-2"); + return toString ? val.toFixed(2) : val; } diff --git a/public/js/script.js b/public/js/script.js index a8c1ab9cd909..33266b512616 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1510,7 +1510,7 @@ function calculateAmounts(invoice) { total = parseFloat(total) + parseFloat(tax); } - invoice.balance_amount = roundToTwo(total) - roundToTwo(invoice.amount) - roundToTwo(invoice.balance); + invoice.balance_amount = roundToTwo(total) - (roundToTwo(invoice.amount) - roundToTwo(invoice.balance)); invoice.tax_amount = tax; invoice.discount_amount = discount; invoice.has_taxes = hasTaxes; @@ -1747,6 +1747,7 @@ function toggleDatePicker(field) { $('#'+field).datepicker('show'); } -function roundToTwo(num) { - return +(Math.round(num + "e+2") + "e-2"); +function roundToTwo(num, toString) { + var val = +(Math.round(num + "e+2") + "e-2"); + return toString ? val.toFixed(2) : val; }