X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Fitem_tax_types_db.inc;h=cca4df026ecbf63bdf378e81e9592b75b4eea09b;hb=fabc8d3e9dbd0ebeb28cefcdf85c5abf90a3496f;hp=24a5eedd86e5fcb0cbd80a86186597e8ad85e62d;hpb=5928cc0bb4164cfd1dfc77f279f6b12d7806294f;p=fa-stable.git

diff --git a/taxes/db/item_tax_types_db.inc b/taxes/db/item_tax_types_db.inc
index 24a5eedd..cca4df02 100644
--- a/taxes/db/item_tax_types_db.inc
+++ b/taxes/db/item_tax_types_db.inc
@@ -1,11 +1,20 @@
 <?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_item_tax_type($name, $exempt, $exempt_from)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 	
 	$sql = "INSERT INTO ".TB_PREF."item_tax_types (name, exempt) 
-		VALUES (".db_escape($name).",$exempt)";
+		VALUES (".db_escape($name).",".db_escape($exempt).")";
 		
 	db_query($sql, "could not add item tax type");	
 	
@@ -19,10 +28,10 @@ function add_item_tax_type($name, $exempt, $exempt_from)
 
 function update_item_tax_type($id, $name, $exempt, $exempt_from)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 	
 	$sql = "UPDATE ".TB_PREF."item_tax_types SET name=".db_escape($name).
-	",	exempt=$exempt WHERE id=$id";
+	",	exempt=".db_escape($exempt)." WHERE id=".db_escape($id);
 	
 	db_query($sql, "could not update item tax type");	
 	
@@ -33,16 +42,18 @@ function update_item_tax_type($id, $name, $exempt, $exempt_from)
 	commit_transaction();	
 }
 
-function get_all_item_tax_types()
+function get_all_item_tax_types($also_inactive=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."item_tax_types";
-	
+	if (!$also_inactive)
+		$sql .= " WHERE !inactive";
+
 	return db_query($sql, "could not get all item tax type");
 } 
 
 function get_item_tax_type($id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."item_tax_types WHERE id=$id";
+	$sql = "SELECT * FROM ".TB_PREF."item_tax_types WHERE id=".db_escape($id);
 	
 	$result = db_query($sql, "could not get item tax type");
 	
@@ -51,19 +62,23 @@ function get_item_tax_type($id)
 
 function get_item_tax_type_for_item($stock_id)
 {
-	$sql = "SELECT ".TB_PREF."item_tax_types.* FROM ".TB_PREF."item_tax_types,".TB_PREF."stock_master WHERE ".TB_PREF."stock_master.stock_id='$stock_id'
-		AND ".TB_PREF."item_tax_types.id=".TB_PREF."stock_master.tax_type_id";
-	
+	$sql = "SELECT tax_type.*, item.vat_category
+		FROM ".TB_PREF."item_tax_types tax_type,"
+			.TB_PREF."stock_master item
+		WHERE 
+			item.stock_id=".db_escape($stock_id)."
+			AND tax_type.id=item.tax_type_id";
+
 	$result = db_query($sql, "could not get item tax type");
-	
-	return db_fetch($result);	
+
+	return db_fetch($result);
 }
 
 function delete_item_tax_type($id)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 		
-	$sql = "DELETE FROM ".TB_PREF."item_tax_types WHERE id=$id";
+	$sql = "DELETE FROM ".TB_PREF."item_tax_types WHERE id=".db_escape($id);
 		
 	db_query($sql, "could not delete item tax type");
 	// also delete all exemptions
@@ -77,23 +92,27 @@ function add_item_tax_type_exemptions($id, $exemptions)
 	for ($i = 0; $i < count($exemptions); $i++) 
 	{
 		$sql = "INSERT INTO ".TB_PREF."item_tax_type_exemptions (item_tax_type_id, tax_type_id)
-			VALUES ($id,  " . $exemptions[$i] . ")";
+			VALUES (".db_escape($id).",  ".db_escape($exemptions[$i]).")";
 		db_query($sql, "could not add item tax type exemptions");					
 	}		
 }
 
 function delete_item_tax_type_exemptions($id)
 {
-	$sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE item_tax_type_id=$id";
+	$sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE item_tax_type_id=".db_escape($id);
 	
 	db_query($sql, "could not delete item tax type exemptions");					
 }
 
 function get_item_tax_type_exemptions($id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."item_tax_type_exemptions WHERE item_tax_type_id=$id";
+	$sql = "SELECT * FROM ".TB_PREF."item_tax_type_exemptions WHERE item_tax_type_id=".db_escape($id);
 	
 	return db_query($sql, "could not get item tax type exemptions");
 }
 
-?>
\ No newline at end of file
+function item_type_inactive($id)
+{
+	$type = get_item_tax_type($id);
+	return @$type['inactive'];
+}