Rerun: user_list_cells Real name sometimes shows empty. @apmuthu

[fa-stable.git] / taxes / db / item_tax_types_db.inc

diff --git a/taxes/db/item_tax_types_db.inc b/taxes/db/item_tax_types_db.inc
index 3a99f9babeba67185d37b449e1e69f04c1761865..446a5dc7cb99ffe5839ccebe0f0929070206c1da 100644 (file)
--- a/taxes/db/item_tax_types_db.inc
+++ b/taxes/db/item_tax_types_db.inc
@@ -14,7 +14,7 @@ function add_item_tax_type($name, $exempt, $exempt_from)
        begin_transaction();
        
        $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");  
        
@@ -31,7 +31,7 @@ function update_item_tax_type($id, $name, $exempt, $exempt_from)
        begin_transaction();
        
        $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");       
        
@@ -42,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");
        
@@ -60,8 +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='$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");
        
@@ -72,7 +77,7 @@ function delete_item_tax_type($id)
 {
        begin_transaction();
                
-       $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
@@ -86,23 +91,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'];
+}