X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_groups_db.inc;h=5c217aa275bb0457c67a8285b57bf0ff4f509fca;hb=187fc607b6bd649b8d5937e05d78df7061681954;hp=2c0b6b0220206c0288f7b2cf80606f282ced972f;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/taxes/db/tax_groups_db.inc b/taxes/db/tax_groups_db.inc
index 2c0b6b02..5c217aa2 100644
--- a/taxes/db/tax_groups_db.inc
+++ b/taxes/db/tax_groups_db.inc
@@ -47,9 +47,10 @@ function update_tax_group($id, $name, $tax_shipping, $taxes, $rates)
 	commit_transaction();			
 }
 
-function get_all_tax_groups()
+function get_all_tax_groups($all=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."tax_groups";
+	if (!$all) $sql .= " WHERE !inactive";
 	
 	return db_query($sql, "could not get all tax group");
 } 
@@ -95,7 +96,7 @@ function delete_tax_group_items($id)
 
 function get_tax_group_items($id)
 {
-	$sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, 
+	$sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, ".TB_PREF."tax_types.rate, 
 		".TB_PREF."tax_types.sales_gl_code, ".TB_PREF."tax_types.purchasing_gl_code  
 		FROM ".TB_PREF."tax_group_items, ".TB_PREF."tax_types 
 		WHERE tax_group_id=".db_escape($id)."
@@ -127,7 +128,7 @@ function get_tax_group_items_as_array($id)
 function get_shipping_tax_group_items()
 {
 
-	$sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, 
+	$sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, ".TB_PREF."tax_types.rate,
 		".TB_PREF."tax_types.sales_gl_code, ".TB_PREF."tax_types.purchasing_gl_code  
 		FROM " .TB_PREF."tax_group_items, ".TB_PREF."tax_types, ".TB_PREF."tax_groups
 		WHERE " .TB_PREF."tax_groups.tax_shipping=1