X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_types_db.inc;h=ae2cb01700da5fe42633a07d2ce3b2ce76d6c5f1;hb=92f26ce5c76266a8b6e96a6b086aa919095e7316;hp=672a4e3613a53a327eeb32e4e64edc83fb7b74b7;hpb=93a920d7c98e55be77d2ea84e6c457f681b7a4e4;p=fa-stable.git

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index 672a4e36..ae2cb017 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -24,65 +24,65 @@ function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $
 		sales_gl_code=".db_escape($sales_gl_code).",
 		purchasing_gl_code=".db_escape($purchasing_gl_code).",
 		rate=$rate
-		WHERE id=$type_id";
+		WHERE id=".db_escape($type_id);
 
 	db_query($sql, "could not update tax type");
 }
 
-function get_all_tax_types()
+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";
-
+	$sql = "SELECT tax_type.*,
+				Chart1.account_name AS SalesAccountName,
+				Chart2.account_name AS PurchasingAccountName
+			FROM ".TB_PREF."tax_types tax_type LEFT JOIN "
+				.TB_PREF."chart_master AS Chart1 ON tax_type.sales_gl_code = Chart1.account_code LEFT JOIN "
+				.TB_PREF."chart_master AS Chart2 ON 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=$type_id";
+	$sql = "SELECT tax_type.*,
+				Chart1.account_name AS SalesAccountName,
+				Chart2.account_name AS PurchasingAccountName
+			FROM ".TB_PREF."tax_types tax_type LEFT JOIN "
+				.TB_PREF."chart_master AS Chart1 ON tax_type.sales_gl_code = Chart1.account_code LEFT JOIN "
+				.TB_PREF."chart_master AS Chart2 ON tax_type.purchasing_gl_code = Chart2.account_code 
+			WHERE id=".db_escape($type_id);
 
 	$result = db_query($sql, "could not get tax type");
 	return db_fetch($result);
 }
 
-function get_tax_type_default_rate($type_id)
+function get_tax_type_rate($type_id)
 {
-	$sql = "SELECT rate FROM ".TB_PREF."tax_types WHERE id=$type_id";
+	$sql = "SELECT rate FROM ".TB_PREF."tax_types WHERE id=".db_escape($type_id);
 
 	$result = db_query($sql, "could not get tax type rate");
 
 	$row = db_fetch_row($result);
-	return $row[0];
+	return is_array($row) ? $row[0] : false;
 }
 
 function delete_tax_type($type_id)
 {
 	begin_transaction();
 
-	$sql = "DELETE FROM ".TB_PREF."tax_types WHERE id=$type_id";
+	$sql = "DELETE FROM ".TB_PREF."tax_types WHERE id=".db_escape($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");
 
@@ -100,9 +100,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);
@@ -112,4 +112,17 @@ function is_tax_gl_unique($gl_code, $gl_code2=-1, $selected_id=-1) {
 
 	return $gl_code2 == -1 ? ($row[0] <= 1) : ($row[0] == 0);
 }
-?>
\ No newline at end of file
+
+function is_tax_account($account_code)
+{
+	$sql= "SELECT id FROM ".TB_PREF."tax_types WHERE 
+		sales_gl_code=".db_escape($account_code)." OR purchasing_gl_code=".db_escape($account_code);
+	$result = db_query($sql, "checking account is tax account");
+	if (db_num_rows($result) > 0) {
+		$acct = db_fetch($result);
+		return $acct['id'];
+	} else
+		return false;
+}
+
+