X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_types_db.inc;h=5cd18ebb1b55815d9340d29acdbdc1f7c9ac01f1;hb=b9656a694227d0d22242fffbb343691b0db82030;hp=c5408af0eb661c815e3a99ae14b82d276a3f5a23;hpb=57ab7b19733486db1572c646c4ff0a58c260ddd2;p=fa-stable.git

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index c5408af0..5cd18ebb 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -1,66 +1,66 @@
 <?php
 
-function add_tax_type($name, $sales_gl_code, $purchasing_gl_code, $rate, $out)
+function add_tax_type($name, $sales_gl_code, $purchasing_gl_code, $rate)
 {
-	$sql = "INSERT INTO ".TB_PREF."tax_types (name, sales_gl_code, purchasing_gl_code, rate, `out`) 
-		VALUES ('$name', '$sales_gl_code', '$purchasing_gl_code', $rate, $out)";
-		
-	db_query($sql, "could not add tax type");		
+	$sql = "INSERT INTO ".TB_PREF."tax_types (name, sales_gl_code, purchasing_gl_code, rate)
+		VALUES (".db_escape($name).", ".db_escape($sales_gl_code)
+		.", ".db_escape($purchasing_gl_code).", $rate)";
+
+	db_query($sql, "could not add tax type");
 }
 
-function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $rate, $out)
+function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $rate)
 {
-	$sql = "UPDATE ".TB_PREF."tax_types SET name='$name',
-		sales_gl_code='$sales_gl_code',
-		purchasing_gl_code='$purchasing_gl_code',
-		rate=$rate,
-		`out`=$out
+	$sql = "UPDATE ".TB_PREF."tax_types SET name=".db_escape($name).",
+		sales_gl_code=".db_escape($sales_gl_code).",
+		purchasing_gl_code=".db_escape($purchasing_gl_code).",
+		rate=$rate
 		WHERE id=$type_id";
-	
-	db_query($sql, "could not update tax type");			
+
+	db_query($sql, "could not update tax type");
 }
 
 function get_all_tax_types()
 {
 	$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 
+		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";
-	
+
 	return db_query($sql, "could not get all tax types");
-} 
+}
 
 function get_all_tax_types_simple()
 {
 	$sql = "SELECT * FROM ".TB_PREF."tax_types";
-	
+
 	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 
+		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";
-	
+
 	$result = db_query($sql, "could not get tax type");
-	
+
 	return db_fetch($result);
 }
 
 function get_tax_type_default_rate($type_id)
 {
 	$sql = "SELECT rate FROM ".TB_PREF."tax_types WHERE id=$type_id";
-	
+
 	$result = db_query($sql, "could not get tax type rate");
-	
+
 	$row = db_fetch_row($result);
 	return $row[0];
 }
@@ -68,17 +68,17 @@ function get_tax_type_default_rate($type_id)
 function delete_tax_type($type_id)
 {
 	begin_transaction();
-		
+
 	$sql = "DELETE FROM ".TB_PREF."tax_types WHERE id=$type_id";
-		
-	db_query($sql, "could not delete tax type");	
-	
+
+	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";
-	
+
 	db_query($sql, "could not delete item tax type exemptions");
-	
-	commit_transaction();		
+
+	commit_transaction();
 }
 
 ?>
\ No newline at end of file