X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Fitem_tax_types_db.inc;h=809f9f9ebe43e233f753c2c63be3ec7a18d64ef9;hb=41112dc462ea9222b584f9f2202e3cf45623b98b;hp=7e034e4b746242bd4f3abd47bf770726128d877a;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/taxes/db/item_tax_types_db.inc b/taxes/db/item_tax_types_db.inc
index 7e034e4b..809f9f9e 100644
--- a/taxes/db/item_tax_types_db.inc
+++ b/taxes/db/item_tax_types_db.inc
@@ -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,9 +62,11 @@ 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 item_tax_type.*
+		FROM ".TB_PREF."item_tax_types item_tax_type,"
+			.TB_PREF."stock_master item
+		WHERE item.stock_id=".db_escape($stock_id)."
+		AND item_tax_type.id=item.tax_type_id";
 	
 	$result = db_query($sql, "could not get item tax type");
 	
@@ -106,4 +110,3 @@ function get_item_tax_type_exemptions($id)
 	return db_query($sql, "could not get item tax type exemptions");
 }
 
-?>
\ No newline at end of file