X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_groups_db.inc;h=fb40bf7de1dccd349c24fd98ddd727bd682d64ed;hb=b72c2a0476688017a61969cbc35dd7cffb4ed78e;hp=032cc560f6596b2fb54e5e4b29f1cf79e1179a38;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/taxes/db/tax_groups_db.inc b/taxes/db/tax_groups_db.inc
index 032cc560..fb40bf7d 100644
--- a/taxes/db/tax_groups_db.inc
+++ b/taxes/db/tax_groups_db.inc
@@ -89,12 +89,11 @@ function delete_tax_group_items($id)
 //
 function get_tax_group_rates($group_id=null, $tax_shipping=false)
 {
-	global $suppress_tax_rates;
+	global $SysPrefs;
 
 	$sql = 
 	"SELECT t.id as tax_type_id,"
-		.(isset($suppress_tax_rates) && $suppress_tax_rates == 1
-			? "t.name as tax_type_name,"
+		.($SysPrefs->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,
@@ -126,7 +125,7 @@ function get_tax_group_items_as_array($id)
 	return $ret_tax_array;
 }
 
-function get_shipping_tax_as_array($id)
+function get_shipping_tax_as_array($id=null)
 {
 	$ret_tax_array = array();
 
@@ -140,4 +139,3 @@ function get_shipping_tax_as_array($id)
 	
 	return $ret_tax_array;
 }
-?>
\ No newline at end of file