From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 13 Jul 2011 08:57:25 +0000 (+0200)
Subject: Rerun of tax_groups_db.inc
X-Git-Tag: v2.4.2~19^2~378
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=f16eb4448423bb75af69b288899ba9fc3961154e

Rerun of tax_groups_db.inc
---

diff --git a/taxes/db/tax_groups_db.inc b/taxes/db/tax_groups_db.inc
index cb411d54..1880b216 100644
--- a/taxes/db/tax_groups_db.inc
+++ b/taxes/db/tax_groups_db.inc
@@ -90,29 +90,7 @@ function delete_tax_group_items($id)
 function get_tax_group_rates($group_id=null, $tax_shipping=false)
 {
 	global $suppress_tax_rates;
-/*
-	$sql = 
-		"SELECT ";
-	if (!$group_id)
-		$sql .= "DISTINCT ";
-	$sql .= "t.id as tax_type_id,"
-		.(isset($suppress_tax_rates) && $suppress_tax_rates == 1
-			? "t.name as tax_type_name,"
-			: "CONCAT(t.name, ' (', t.rate, '%)') as tax_type_name,")
-		."t.sales_gl_code,
-		  t.purchasing_gl_code,
-		  t.rate,
-		  g.tax_shipping,
-		  g.tax_group_id
-		FROM ".TB_PREF."tax_types t, ".TB_PREF."tax_group_items g 
-		  WHERE t.id=g.tax_type_id";
-	if ($group_id)
-		$sql .= " AND g.tax_group_id=".db_escape($group_id);
-			
-	$sql .= " AND t.inactive=0";
-	if ($tax_shipping)
-		$sql .= " AND g.tax_shipping=1";
-*/
+
 	$sql = 
 	"SELECT t.id as tax_type_id,"
 		.(isset($suppress_tax_rates) && $suppress_tax_rates == 1