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 9ff0f80aebfcf62b8b0e9dd7be43d65a5aff9c72..61959f81edfb3726a7af09c5a8589f4779718e4a 100644 (file)
--- 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 08bf64c868245dc2a4a9a591bfee338a4c6dc39a..90d431fe5df70ae4ed6db482582fe5c86a2c362e 100644 (file)
--- 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");
 }