Merged changes from master branch up to current state.

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

diff --git a/taxes/db/tax_groups_db.inc b/taxes/db/tax_groups_db.inc
index 1880b216fbf0a9306b4e3289563be3823494dc61..f39eccef51bbc1655a4d6532edebddff126330a1 100644 (file)
--- a/taxes/db/tax_groups_db.inc
+++ b/taxes/db/tax_groups_db.inc
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function add_tax_group($name, $taxes, $rates, $tax_shippings)
+function add_tax_group($name, $taxes, $tax_shippings)
 {
        begin_transaction();
 
@@ -18,12 +18,12 @@ function add_tax_group($name, $taxes, $rates, $tax_shippings)
        
        $id = db_insert_id();
        
-       add_tax_group_items($id, $taxes, $rates, $tax_shippings);       
+       add_tax_group_items($id, $taxes, $tax_shippings);       
        
        commit_transaction();   
 }
 
-function update_tax_group($id, $name, $taxes, $rates, $tax_shippings)
+function update_tax_group($id, $name, $taxes, $tax_shippings)
 {
        begin_transaction();    
 
@@ -31,7 +31,7 @@ function update_tax_group($id, $name, $taxes, $rates, $tax_shippings)
        db_query($sql, "could not update tax group");
        
        delete_tax_group_items($id);
-       add_tax_group_items($id, $taxes, $rates, $tax_shippings);       
+       add_tax_group_items($id, $taxes, $tax_shippings);       
        
        commit_transaction();                   
 }
@@ -66,12 +66,12 @@ function delete_tax_group($id)
        commit_transaction();
 }
 
-function add_tax_group_items($id, $items, $rates, $tax_shippings)
+function add_tax_group_items($id, $items, $tax_shippings)
 {
        for ($i=0; $i < count($items); $i++) 
        {
-               $sql = "INSERT INTO ".TB_PREF."tax_group_items (tax_group_id, tax_type_id, rate, tax_shipping)
-                       VALUES (".db_escape($id).",  ".db_escape($items[$i]).", " . $rates[$i] .", " . $tax_shippings[$i] .")";
+               $sql = "INSERT INTO ".TB_PREF."tax_group_items (tax_group_id, tax_type_id, tax_shipping)
+                       VALUES (".db_escape($id).",  ".db_escape($items[$i]).", " . $tax_shippings[$i] .")";
                db_query($sql, "could not add item tax group item");                                    
        }               
 }
@@ -89,12 +89,11 @@ function delete_tax_group_items($id)
 //
 function get_tax_group_rates($group_id=null, $tax_shipping=false)
 {
-       global $suppress_tax_rates;
+       global $SysPrefs;
 
        $sql = 
        "SELECT t.id as tax_type_id,"
-               .(isset($suppress_tax_rates) && $suppress_tax_rates == 1
-                       ? "t.name as tax_type_name,"
+               .($SysPrefs->suppress_tax_rates() == 1 ? "t.name as tax_type_name,"
                        : "CONCAT(t.name, ' (', t.rate, '%)') as tax_type_name,")
                ."t.sales_gl_code,
                  t.purchasing_gl_code,
@@ -140,4 +139,3 @@ function get_shipping_tax_as_array($id)
        
        return $ret_tax_array;
 }
-?>
\ No newline at end of file