X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_types_db.inc;h=f42470eff9b5b3134a02d70e9520ad44e211510f;hb=33745a47ad9046cd1c42a0a6ab6351638c4c8327;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..f42470ef 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -24,12 +24,12 @@ 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,
@@ -39,6 +39,7 @@ function get_all_tax_types()
 		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";
 	return db_query($sql, "could not get all tax types");
 }
 
@@ -57,7 +58,7 @@ function get_tax_type($type_id)
 		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";
+		AND ".TB_PREF."tax_types.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);
@@ -65,7 +66,7 @@ function get_tax_type($type_id)
 
 function get_tax_type_default_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");
 
@@ -77,7 +78,7 @@ 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");
 
@@ -112,4 +113,18 @@ function is_tax_gl_unique($gl_code, $gl_code2=-1, $selected_id=-1) {
 
 	return $gl_code2 == -1 ? ($row[0] <= 1) : ($row[0] == 0);
 }
+
+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;
+}
+
+
 ?>
\ No newline at end of file