Rerun of tax_groups_db.inc
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 13 Jul 2011 08:57:25 +0000 (10:57 +0200)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 13 Jul 2011 08:57:25 +0000 (10:57 +0200)
taxes/db/tax_groups_db.inc

index cb411d54a7d93e12733328d2a40cd6ecc1372922..1880b216fbf0a9306b4e3289563be3823494dc61 100644 (file)
@@ -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