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

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index 5cd18ebb..e57ffb35 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 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)
@@ -15,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,
@@ -30,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");
 }
 
@@ -48,16 +58,15 @@ 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);
 }
 
 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");
 
@@ -69,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");
 
@@ -81,4 +90,27 @@ function delete_tax_type($type_id)
 	commit_transaction();
 }
 
+/*
+	Check if gl_code is used by more than 2 tax types,
+	or check if the two gl codes are not used by any other 
+	than selected tax type.
+	Necessary for pre-2.2 installations.
+*/
+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	
+		WHERE (sales_gl_code=" .db_escape($gl_code)
+		." OR purchasing_gl_code=" .db_escape($purch_code). ")";
+
+	if ($selected_id != -1)
+		$sql .= " AND id!=".db_escape($selected_id);
+
+	$res = db_query($sql, "could not query gl account uniqueness");
+	$row = db_fetch($res);
+
+	return $gl_code2 == -1 ? ($row[0] <= 1) : ($row[0] == 0);
+}
 ?>
\ No newline at end of file