diff --git a/app/Helpers/Invoice/InvoiceCalc.php b/app/Helpers/Invoice/InvoiceCalc.php
index f57eeff5960d..90e427dc3292 100644
--- a/app/Helpers/Invoice/InvoiceCalc.php
+++ b/app/Helpers/Invoice/InvoiceCalc.php
@@ -104,9 +104,9 @@ class InvoiceCalc
 
 		if(isset($this->invoice->id) && $this->invoice->id >= 1)
 		{
-            $this->invoice->balance = round($this->total - ($this->invoice->amount - $this->invoice->balance), 2);
+            $this->balance = round($this->total - ($this->invoice->amount - $this->invoice->balance), 2);
         } else {
-            $this->invoice->balance = $this->total;
+            $this->balance = $this->total;
         }
 
 		return $this;
@@ -293,6 +293,25 @@ class InvoiceCalc
 		return $this;
 	}
 
+	public function getTotal()
+	{
+		return $this->total;
+	}
+
+	public function setTotal($value)
+	{
+		$this->total = $value;
+	}
+
+	public function getBalance()
+	{
+		return $this->balance;
+	}
+
+	public function setBalance($value)
+	{
+		$this->balance = $value;
+	}
 
 /*
 	private function setDiscount($amount, $discount, $is_amount_discount)
@@ -305,15 +324,7 @@ class InvoiceCalc
         
 	}
 
-	private function getInvoiceTotal()
-	{
-		return $this->invoice_total;
-	}
 
-	private function setInvoiceTotal($invoice_total)
-	{
-		$this->invoice_total = $invoice_total;
-	}
 
 */
 
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 0cdb5a2d1aeb..5ddf3b9e1c9f 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -70,5 +70,17 @@ class InvoiceTest extends TestCase
 		$this->invoice_calc->build();
 
 		$this->assertEquals($this->invoice_calc->getSubTotal(), 20);
+		$this->assertEquals($this->invoice_calc->getTotal(), 20);
+	}
+
+	public function testInvoiceTotalsWithDiscount()
+	{
+		$this->invoice->discount = 5;
+			
+		$this->invoice_calc->build();
+
+		$this->assertEquals($this->invoice_calc->getSubTotal(), 20);
+		$this->assertEquals($this->invoice_calc->getTotal(), 15);
+		$this->assertEquals($this->invoice_calc->getBalance(), 15);
 	}
 }
\ No newline at end of file