From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 16 Apr 2015 07:02:55 +0000 (+0200)
Subject: Item Tax Types: fixed inactive item tax types display switching.
X-Git-Tag: v2.4.2~19^2~206
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=33dfc21a26f08e9ac19048bbcf80cce2351a6cfe;p=fa-stable.git

Item Tax Types: fixed inactive item tax types display switching.
---

diff --git a/taxes/db/item_tax_types_db.inc b/taxes/db/item_tax_types_db.inc
index 9ff0f80a..61959f81 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");
 } 
 
diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index 08bf64c8..90d431fe 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -45,7 +45,7 @@ function get_all_tax_types($all=false)
 
 function get_all_tax_types_simple()
 {
-	$sql = "SELECT * FROM ".TB_PREF."tax_types";
+	$sql = "SELECT * FROM ".TB_PREF."tax_types WHERE !inactive";
 
 	return db_query($sql, "could not get all tax types");
 }