X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=taxes%2Fdb%2Fitem_tax_types_db.inc;h=cca4df026ecbf63bdf378e81e9592b75b4eea09b;hb=fabc8d3e9dbd0ebeb28cefcdf85c5abf90a3496f;hp=9ff0f80aebfcf62b8b0e9dd7be43d65a5aff9c72;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/taxes/db/item_tax_types_db.inc b/taxes/db/item_tax_types_db.inc
index 9ff0f80a..cca4df02 100644
--- a/taxes/db/item_tax_types_db.inc
+++ b/taxes/db/item_tax_types_db.inc
@@ -11,7 +11,7 @@
 ***********************************************************************/
 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).",".db_escape($exempt).")";
@@ -28,7 +28,7 @@ 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=".db_escape($exempt)." WHERE id=".db_escape($id);
@@ -42,10 +42,12 @@ 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");
 } 
 
@@ -60,18 +62,21 @@ 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=".db_escape($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=".db_escape($id);
 		
@@ -106,3 +111,8 @@ function get_item_tax_type_exemptions($id)
 	return db_query($sql, "could not get item tax type exemptions");
 }
 
+function item_type_inactive($id)
+{
+	$type = get_item_tax_type($id);
+	return @$type['inactive'];
+}