diff --git a/application/models/Sale.php b/application/models/Sale.php
index 9740f720f..ba0182fa1 100644
--- a/application/models/Sale.php
+++ b/application/models/Sale.php
@@ -24,13 +24,11 @@ class Sale extends CI_Model
 		{
 			$sale_total = 'SUM(' . $sale_price . ')';
 			$sale_subtotal = 'SUM(' . $sale_price . ' - sales_items_taxes.tax)';
-			$sale_tax = 'SUM(' . $sale_price . ' * (1 - 100 / (100 + sales_items_taxes.percent)))';
 		}
 		else
 		{
 			$sale_total = 'SUM(' . $sale_price . ' + sales_items_taxes.tax)';
 			$sale_subtotal = 'SUM(' . $sale_price . ')';
-			$sale_tax = 'SUM(' . $sale_price . ' * (sales_items_taxes.percent / 100))';
 		}
 
 		$sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';
@@ -43,9 +41,7 @@ class Sale extends CI_Model
 				SELECT sales_items_taxes.sale_id AS sale_id,
 					sales_items_taxes.item_id AS item_id,
 					sales_items_taxes.line AS line,
-					' . "
-					IFNULL(ROUND($sale_tax, $decimals), 0) AS tax
-					" . '
+					SUM(sales_items_taxes.item_tax_amount) AS tax
 				FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
 				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
 					ON sales.sale_id = sales_items_taxes.sale_id
@@ -142,13 +138,11 @@ class Sale extends CI_Model
 		{
 			$sale_total = 'SUM(' . $sale_price . ')';
 			$sale_subtotal = 'SUM(' . $sale_price . ' - sales_items_taxes.tax)';
-			$sale_tax = 'SUM(' . $sale_price . ' * (1 - 100 / (100 + sales_items_taxes.percent)))';
 		}
 		else
 		{
 			$sale_total = 'SUM(' . $sale_price . ' + sales_items_taxes.tax)';
 			$sale_subtotal = 'SUM(' . $sale_price . ')';
-			$sale_tax = 'SUM(' . $sale_price . ' * (sales_items_taxes.percent / 100))';
 		}
 
 		$sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';
@@ -162,9 +156,7 @@ class Sale extends CI_Model
 				SELECT sales_items_taxes.sale_id AS sale_id,
 					sales_items_taxes.item_id AS item_id,
 					sales_items_taxes.line AS line,
-					' . "
-					IFNULL(ROUND($sale_tax, $decimals), 0) AS tax
-					" . '
+					SUM(sales_items_taxes.item_tax_amount) as tax
 				FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
 				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
 					ON sales.sale_id = sales_items_taxes.sale_id
@@ -1007,13 +999,11 @@ class Sale extends CI_Model
 		{
 			$sale_total = 'SUM(' . $sale_price . ')';
 			$sale_subtotal = 'SUM(' . $sale_price . ' - sales_items_taxes.tax)';
-			$sale_tax = 'SUM(' . $sale_price . ' * (1 - 100 / (100 + sales_items_taxes.percent)))';
 		}
 		else
 		{
 			$sale_total = 'SUM(' . $sale_price . ' + sales_items_taxes.tax)';
 			$sale_subtotal = 'SUM(' . $sale_price . ')';
-			$sale_tax = 'SUM(' . $sale_price . ' * (sales_items_taxes.percent / 100))';
 		}
 
 		$sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';
@@ -1027,9 +1017,7 @@ class Sale extends CI_Model
 				SELECT sales_items_taxes.sale_id AS sale_id,
 					sales_items_taxes.item_id AS item_id,
 					sales_items_taxes.line AS line,
-					' . "
-					IFNULL(ROUND($sale_tax, $decimals), 0) AS tax
-					" . '
+					SUM(sales_items_taxes.item_tax_amount) as tax
 				FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
 				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
 					ON sales.sale_id = sales_items_taxes.sale_id
diff --git a/application/models/reports/Detailed_sales.php b/application/models/reports/Detailed_sales.php
index 3ccd7fedd..d56a509bf 100644
--- a/application/models/reports/Detailed_sales.php
+++ b/application/models/reports/Detailed_sales.php
@@ -113,8 +113,9 @@ class Detailed_sales extends Report
 
 	public function getSummaryData(array $inputs)
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
+		$this->db->select('SUM(subtotal) AS subtotal, SUM(sales_taxes.sale_tax_amount) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
+		$this->db->from('sales_items_temp as sales_items_temp');
+		$this->db->join('sales_taxes as sales_taxes', 'sales_items_temp.sale_id = sales_taxes.sale_id');
 
 		if($inputs['location_id'] != 'all')
 		{
diff --git a/application/models/reports/Specific_customer.php b/application/models/reports/Specific_customer.php
index f94a4e400..2af3457fb 100644
--- a/application/models/reports/Specific_customer.php
+++ b/application/models/reports/Specific_customer.php
@@ -87,10 +87,12 @@ class Specific_customer extends Report
 
 	public function getSummaryData(array $inputs)
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
+		$this->db->select('SUM(subtotal) AS subtotal, SUM(sales_taxes.sale_tax_amount) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
+		$this->db->from('sales_items_temp as sales_items_temp');
+		$this->db->join('sales_taxes as sales_taxes', 'sales_items_temp.sale_id = sales_taxes.sale_id');
 		$this->db->where('customer_id', $inputs['customer_id']);
 
+
 		if ($inputs['sale_type'] == 'sales')
 		{
 			$this->db->where('quantity_purchased > 0');