X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_calc.inc;h=3f54bd226aa65ee6871e86e30598f11f57d9ec37;hb=181cd75a7b027c398cc382974bc9f97cba8c48b3;hp=aa8f9de81c456367cfb0c5f8aa699cfe11c68997;hpb=4e436722cb991b7273c08bdc1dc53b5390772972;p=fa-stable.git diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc index aa8f9de8..3f54bd22 100644 --- a/taxes/tax_calc.inc +++ b/taxes/tax_calc.inc @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ include_once($path_to_root . "/taxes/db/tax_groups_db.inc"); include_once($path_to_root . "/taxes/db/tax_types_db.inc"); @@ -15,32 +15,6 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc"); //--------------------------------------------------------------------------------- -// returns the tax cost for a given item -/* -function get_tax_value_for_item($stock_id, $price, $tax_group) -{ - // if price is zero, then can't be taxed - if ($price == 0) - return 0; - - $ret_tax_array = get_tax_group_items_as_array($tax_group); - - $tax_array = get_taxes_for_item($stock_id, $ret_tax_array); - if ($tax_array == null) - return 0; - - $tax_multiplier = 0; - - // loop for all items - foreach ($tax_array as $taxitem) { - $tax_multiplier += $taxitem["rate"]; - } - - return $price * ($tax_multiplier / 100); -} -*/ -//--------------------------------------------------------------------------------- - // returns the price of a given item minus any included taxes // for item $stock_id with line price $price, // with applicable tax rates $tax_group_array or group id $tax_group @@ -76,7 +50,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)), user_price_dec()); + return round($price / (1 + ($tax_multiplier / 100)), 2*user_price_dec()); } // // Full price (incl. VAT) for item $stock_id with line price $price, @@ -112,7 +86,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)), user_price_dec()); + return round($price * (1 + ($tax_multiplier / 100)), 2*user_price_dec()); } //--------------------------------------------------------------------------------- @@ -188,13 +162,10 @@ 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 - //$ret_tax_array[$index]['Value'] += round($prices[$i] * $item_tax['rate'] - // / ($item_tax['rate'] + 100), user_price_dec()); - $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / ($item_tax['rate'] + 100)); - $ret_tax_array[$index]['Net'] += ($prices[$i] * 100 / ($item_tax['rate'] + 100)); + $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]['Net'] += $nprice; } else { - //$ret_tax_array[$index]['Value'] += - // round($prices[$i] * $item_tax['rate'] / 100, user_price_dec()); $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100); $ret_tax_array[$index]['Net'] += $prices[$i]; } @@ -208,18 +179,26 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc $item_taxes = get_shipping_tax_as_array(); if ($item_taxes != null) { + if ($tax_included == 1) + { + $tax_rate = 0; + foreach ($item_taxes as $item_tax) + { + $index = $item_tax['tax_type_id']; + if(isset($ret_tax_array[$index])) { + $tax_rate += $item_tax['rate']; + } + } + $shipping_net = round2($shipping_cost / (1 + ($tax_rate / 100)), user_price_dec()); + } foreach ($item_taxes as $item_tax) { $index = $item_tax['tax_type_id']; if(isset($ret_tax_array[$index])) { if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings - //$ret_tax_array[$index]['Value'] += round($shipping_cost * $item_tax['rate'] - // / ($item_tax['rate'] + 100), user_price_dec()); - $ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / ($item_tax['rate'] + 100)); - $ret_tax_array[$index]['Net'] += ($shipping_cost * 100 / ($item_tax['rate'] + 100)); + $ret_tax_array[$index]['Value'] += ($shipping_net * $item_tax['rate'] / 100); + $ret_tax_array[$index]['Net'] += $shipping_net; } else { - //$ret_tax_array[$index]['Value'] += - // round($shipping_cost * $item_tax['rate'] / 100, user_price_dec()); $ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100); $ret_tax_array[$index]['Net'] += $shipping_cost; } @@ -232,68 +211,5 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc return $ret_tax_array; } -// -// Get all taxes for given tax_type_id. This can be used when -// no tax group exemptions are active (local sales). -// To be used in quick entries. -// -function get_taxes_for_item_tax($tax_type_id) -{ - $item_tax_type = get_item_tax_type($tax_type_id); - - // if the item is exempt from all taxes then return 0 - if ($item_tax_type["exempt"]) - return null; - - // get the exemptions for this item tax type - $item_tax_type_exemptions_db = get_item_tax_type_exemptions($tax_type_id); - - // read them all into an array to minimize db querying - $item_tax_type_exemptions = array(); - while ($item_tax_type_exemp = db_fetch($item_tax_type_exemptions_db)) - { - $item_tax_type_exemptions[] = $item_tax_type_exemp["tax_type_id"]; - } - - $ret_tax_array = array(); - - $tax_rates = get_all_tax_types_simple(); - // if any of the taxes are in the exemptions, then skip - while($tax_rate = db_fetch($tax_rates)) - { - - $skip = false; - - // if it's in the exemptions, skip - foreach ($item_tax_type_exemptions as $exemption) - { - if (($tax_rate['id'] == $exemption)) - { - $skip = true; - break; - } - } - - if (!$skip) - { - $index = $tax_rate['id']; - $ret_tax_array[$index] = $tax_rate; - } - } - - return $ret_tax_array; -} - -function is_tax_account($account_code) -{ - $sql= "SELECT id FROM ".TB_PREF."tax_types WHERE - sales_gl_code='$account_code' OR purchasing_gl_code='$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