X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_types_db.inc;h=ce73935f61b95c17756865ac824b3ebf605b211c;hb=772bf0b1831da4239fd643c3608a57f9e59d345c;hp=90d431fe5df70ae4ed6db482582fe5c86a2c362e;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index 90d431fe..ce73935f 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -31,15 +31,16 @@ 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");
 }
 
@@ -52,13 +53,14 @@ function get_all_tax_types_simple()
 
 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);
@@ -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);