From 03eb26a6db892f07593c1db738b83aebd459227e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2019 23:09:39 +1100
Subject: [PATCH] clean up invoice calculations  - exclusive taxes (#3000)

---
 app/Helpers/Invoice/InvoiceItemSum.php | 2 +-
 app/Helpers/Invoice/InvoiceSum.php     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index 076e0cd4b853..da66d87d9486 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -256,7 +256,7 @@ class InvoiceItemSum
 			if($item_tax_rate3_total > 0)
 				$this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
 
-\Log::error($this->item->tax_name1. " ". $this->item->line_total." ". $this->invoice->discount." ". $this->sub_total. " ".$amount. " ". $item_tax);
+//\Log::error($this->item->tax_name1. " ". $this->item->line_total." ". $this->invoice->discount." ". $this->sub_total. " ".$amount. " ". $item_tax);
 		}
 
 		$this->setTotalTaxes($item_tax);
diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index 4b5efbf8b480..42a49086f3f7 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -173,7 +173,8 @@ class InvoiceSum
 	{
 		//Build invoice values here and return Invoice
 		$this->setCalculatedAttributes();
-
+		$this->invoice->save();
+		
 		return $this->invoice;
 	}
 
@@ -233,8 +234,8 @@ class InvoiceSum
 
 	public function setTaxMap()
 	{
-	//	if($this->invoice->is_amount_discount == true)
-	//		$this->invoice_items->calcTaxesWithAmountDiscount();
+		if($this->invoice->is_amount_discount == true)
+			$this->invoice_items->calcTaxesWithAmountDiscount();
 
 		$this->tax_map = collect();