Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-31 15:42:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix rounding

Browse Source
This commit is contained in:
Hillel Coren 2017-11-01 13:50:31 +02:00
parent ceeb642995
commit f1b883b54b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/script.js
View File

@ -670,7 +670,7 @@ function calculateAmounts(invoice) {
// sum line item // sum line item
for (var i=0; i<invoice.invoice_items.length; i++) { for (var i=0; i<invoice.invoice_items.length; i++) {
var item = invoice.invoice_items[i]; var item = invoice.invoice_items[i];
var lineTotal = invoice.is_statement ? roundToTwo(NINJA.parseFloat(item.balance)) : roundSignificant(NINJA.parseFloat(item.cost)) * roundSignificant(NINJA.parseFloat(item.qty)); var lineTotal = invoice.is_statement ? roundToTwo(NINJA.parseFloat(item.balance)) : roundSignificant(NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty));
lineTotal = roundToTwo(lineTotal); lineTotal = roundToTwo(lineTotal);
if (lineTotal) { if (lineTotal) {
total += lineTotal; total += lineTotal;
@ -717,7 +717,7 @@ function calculateAmounts(invoice) {
} }
// calculate line item tax // calculate line item tax
var lineTotal = roundToFour(NINJA.parseFloat(item.cost)) * roundToFour(NINJA.parseFloat(item.qty)); var lineTotal = roundSignificant(NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty));
if (invoice.discount != 0) { if (invoice.discount != 0) {
if (parseInt(invoice.is_amount_discount)) { if (parseInt(invoice.is_amount_discount)) {
lineTotal -= roundToTwo((lineTotal/total) * invoice.discount); lineTotal -= roundToTwo((lineTotal/total) * invoice.discount);

4
resources/views/invoices/knockout.blade.php
View File

@ -879,9 +879,7 @@ function ItemModel(data) {
this.totals = ko.observable(); this.totals = ko.observable();
this.totals.rawTotal = ko.computed(function() { this.totals.rawTotal = ko.computed(function() {
var cost = roundSignificant(NINJA.parseFloat(self.cost())); var value = roundSignificant(NINJA.parseFloat(self.cost()) * NINJA.parseFloat(self.qty()));
var qty = roundSignificant(NINJA.parseFloat(self.qty()));
var value = cost * qty;
return value ? roundToTwo(value) : 0; return value ? roundToTwo(value) : 0;
}); });