X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_types_db.inc;h=ce73935f61b95c17756865ac824b3ebf605b211c;hb=a9e7141956ef0a60b58e9a627beee93cd35ed43c;hp=f7ed2eb1e87cab62907cbe18069402d04d7ef595;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index f7ed2eb1..ce73935f 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -31,34 +31,36 @@ function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $
 
 function get_all_tax_types($all=false)
 {
-	$sql = "SELECT ".TB_PREF."tax_types.*,
-		Chart1.account_name AS SalesAccountName,
-		Chart2.account_name AS PurchasingAccountName
-		FROM ".TB_PREF."tax_types, ".TB_PREF."chart_master AS Chart1,
-		".TB_PREF."chart_master AS Chart2
-		WHERE ".TB_PREF."tax_types.sales_gl_code = Chart1.account_code
-		AND ".TB_PREF."tax_types.purchasing_gl_code = Chart2.account_code";
-
-	if (!$all) $sql .= " AND !".TB_PREF."tax_types.inactive";
+	$sql = "SELECT tax_type.*,
+				Chart1.account_name AS SalesAccountName,
+				Chart2.account_name AS PurchasingAccountName
+			FROM ".TB_PREF."tax_types tax_type,"
+				.TB_PREF."chart_master AS Chart1,"
+				.TB_PREF."chart_master AS Chart2
+			WHERE tax_type.sales_gl_code = Chart1.account_code
+				AND tax_type.purchasing_gl_code = Chart2.account_code";
+
+	if (!$all) $sql .= " AND !tax_type.inactive";
 	return db_query($sql, "could not get all tax types");
 }
 
 function get_all_tax_types_simple()
 {
-	$sql = "SELECT * FROM ".TB_PREF."tax_types";
+	$sql = "SELECT * FROM ".TB_PREF."tax_types WHERE !inactive";
 
 	return db_query($sql, "could not get all tax types");
 }
 
 function get_tax_type($type_id)
 {
-	$sql = "SELECT ".TB_PREF."tax_types.*,
-		Chart1.account_name AS SalesAccountName,
-		Chart2.account_name AS PurchasingAccountName
-		FROM ".TB_PREF."tax_types, ".TB_PREF."chart_master AS Chart1,
-		".TB_PREF."chart_master AS Chart2
-		WHERE ".TB_PREF."tax_types.sales_gl_code = Chart1.account_code
-		AND ".TB_PREF."tax_types.purchasing_gl_code = Chart2.account_code AND id=".db_escape($type_id);
+	$sql = "SELECT tax_type.*,
+				Chart1.account_name AS SalesAccountName,
+				Chart2.account_name AS PurchasingAccountName
+			FROM ".TB_PREF."tax_types tax_type,"
+				.TB_PREF."chart_master AS Chart1,"
+				.TB_PREF."chart_master AS Chart2
+			WHERE tax_type.sales_gl_code = Chart1.account_code
+		AND tax_type.purchasing_gl_code = Chart2.account_code AND id=".db_escape($type_id);
 
 	$result = db_query($sql, "could not get tax type");
 	return db_fetch($result);
@@ -83,7 +85,7 @@ function delete_tax_type($type_id)
 	db_query($sql, "could not delete tax type");
 
 	// also delete any item tax exemptions associated with this type
-	$sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE tax_type_id=$type_id";
+	$sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE tax_type_id=".db_escape($type_id);
 
 	db_query($sql, "could not delete item tax type exemptions");
 
@@ -101,9 +103,9 @@ function is_tax_gl_unique($gl_code, $gl_code2=-1, $selected_id=-1) {
 	$purch_code = $gl_code2== -1 ? $gl_code : $gl_code2;
 
 	$sql = "SELECT count(*) FROM "
-		.TB_PREF."tax_types	
+			.TB_PREF."tax_types	
 		WHERE (sales_gl_code=" .db_escape($gl_code)
-		." OR purchasing_gl_code=" .db_escape($purch_code). ")";
+			." OR purchasing_gl_code=" .db_escape($purch_code). ")";
 
 	if ($selected_id != -1)
 		$sql .= " AND id!=".db_escape($selected_id);
@@ -127,4 +129,3 @@ function is_tax_account($account_code)
 }
 
 
-?>
\ No newline at end of file