From f1b883b54b4d71751cc9215cb53793482b4e74da Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 1 Nov 2017 13:50:31 +0200
Subject: [PATCH] Fix rounding

---
 resources/assets/js/script.js               | 4 ++--
 resources/views/invoices/knockout.blade.php | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/script.js b/resources/assets/js/script.js
index 0d4982257d..a4c4d9fca2 100644
--- a/resources/assets/js/script.js
+++ b/resources/assets/js/script.js
@@ -670,7 +670,7 @@ function calculateAmounts(invoice) {
   // sum line item
   for (var i=0; i<invoice.invoice_items.length; 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);
     if (lineTotal) {
       total += lineTotal;
@@ -717,7 +717,7 @@ function calculateAmounts(invoice) {
     }
 
     // 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 (parseInt(invoice.is_amount_discount)) {
             lineTotal -= roundToTwo((lineTotal/total) * invoice.discount);
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index f0a74e8a72..33c0f6716e 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -879,9 +879,7 @@ function ItemModel(data) {
     this.totals = ko.observable();
 
     this.totals.rawTotal = ko.computed(function() {
-        var cost = roundSignificant(NINJA.parseFloat(self.cost()));
-        var qty = roundSignificant(NINJA.parseFloat(self.qty()));
-        var value = cost * qty;
+        var value = roundSignificant(NINJA.parseFloat(self.cost()) * NINJA.parseFloat(self.qty()));
         return value ? roundToTwo(value) : 0;
     });