New report, Sales Summary Report, added under Sales Reports.

[fa-stable.git] / taxes / tax_calc.inc

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index f0be73231fcf1fb5e8d8def1ebfcb0dc545ec898..6f6e9b7b153d4e5669b0900fc42d49921d154358 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -49,8 +49,7 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include
        {
                        $tax_multiplier += $taxitem["rate"];
        }
-       
-       return round($price / (1 + ($tax_multiplier / 100)),  2*user_price_dec());
+       return round($price / (1 + ($tax_multiplier / 100)),  user_price_dec());
 }
 //
 //     Full price (incl. VAT) for item $stock_id with line price $price,
@@ -86,7 +85,7 @@ function get_full_price_for_item($stock_id, $price, $tax_group, $tax_included, $
                        $tax_multiplier += $taxitem["rate"];
        }
        
-       return round($price * (1 + ($tax_multiplier / 100)),  2*user_price_dec());
+       return round($price * (1 + ($tax_multiplier / 100)),  user_price_dec());
 }
 
 //---------------------------------------------------------------------------------
@@ -163,7 +162,7 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                                $index = $item_tax['tax_type_id'];
                                if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
                                  $nprice = get_tax_free_price_for_item($items[$i], $prices[$i], $tax_group, $tax_included);
-                                 $ret_tax_array[$index]['Value'] += ($nprice * $item_tax['rate'] / 100);
+                                 $ret_tax_array[$index]['Value'] += $prices[$i]-$nprice;
                                  $ret_tax_array[$index]['Net'] += $nprice;
                                } else {
                                  $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100);
@@ -212,16 +211,4 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
        return $ret_tax_array;
 }
 
-function is_tax_account($account_code)
-{
-       $sql= "SELECT id FROM ".TB_PREF."tax_types WHERE 
-               sales_gl_code=".db_escape($account_code)." OR purchasing_gl_code=".db_escape($account_code);
-       $result = db_query($sql, "checking account is tax account");
-       if (db_num_rows($result) > 0) {
-               $acct = db_fetch($result);
-               return $acct['id'];
-       } else
-               return false;
-}
-
 ?>
\ No newline at end of file