From 21694d93663dd2c41c7020c6a646baf00cdaa4ed Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 13 Oct 2009 21:49:18 +0000 Subject: [PATCH] Code cleanup (old code removed) --- CHANGELOG.txt | 2 + includes/ui/ui_view.inc | 86 ----------------------------------------- 2 files changed, 2 insertions(+), 86 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d8f5f2a3..3f0dc9e1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -34,6 +34,8 @@ $ /admin/db/users_db.inc /themes/default/renderer.php ! Changed Tag types in reports_classes to be the same as defined in types.inc. Suitable height=5 $ /reporting/includes/reports_classes.inc +! Code cleanup (old code removed) +$ /includes/ui_view.inc 12-Oct-2009 Janusz Dobrowolski # Fixed sql injection vulnerability on some php/mysql configurations diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 9a0d9cce..48ef063e 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -626,92 +626,6 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $qe_line['dimension2_id'], $part, $qe['description']); } } -/* - while ($qe_line = db_fetch($qe_lines)) - { - switch (strtolower($qe_line['action'])) { - case "=": // post current base amount to GL account - $part = $base; - break; - case "a": // post amount to GL account and reduce base - $part = $qe_line['amount']; - break; - case "a+": // post amount to GL account and increase base - $part = $qe_line['amount']; $base += $part; - break; - case "a-": // post amount to GL account and reduce base - $part = $qe_line['amount']; $base -= $part; - break; - case "%": // store acc*amount% to GL account - $part = round2($base * $qe_line['amount'] / 100, user_price_dec()); - break; - case "%+": // ditto & increase base amount - $part = round2($base * $qe_line['amount'] / 100, user_price_dec()); - $base += $part; - break; - case "%-": // ditto & reduce base amount - $part = round2($base * $qe_line['amount'] / 100, user_price_dec()); - $base -= $part; - break; - case "t": // post taxes calculated on base amount - case "t+": // ditto & increase base amount - case "t-": // ditto & reduce base amount - //$taxes = get_taxes_for_item_tax($qe_line['dest_id']); - if ($type == QE_SUPPINV) - $qe_line['dest_id'] = $cart->tax_group_id; - $taxes = array(); - $res = get_tax_group_items($qe_line['dest_id']); - while ($row = db_fetch($res)) - $taxes[] = $row; - $tax_total = 0; - $totrate = 0; - // find total tax - if (substr($qe_line['action'],0,1) != 'T') { - foreach ($taxes as $index => $item_tax) { - $totrate += $item_tax['rate']; - } - } - $taxbase = $base/($totrate+100); - foreach ($taxes as $index => $item_tax) { - $tax = round2($taxbase * $item_tax['rate'], user_price_dec()); - $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) - ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code']; - $tax_total += $tax; - if ($tax==0) continue; - if (!is_tax_gl_unique($gl_code)) { - display_error(_("Cannot post to GL account used by more than one tax type.")); - break 3; - } - if ($type != QE_SUPPINV) - $cart->add_gl_item($gl_code, - $qe_line['dimension_id'], $qe_line['dimension2_id'], - $tax, $qe['description']); - else - { - $acc_name = get_gl_account_name($gl_code); - $cart->add_gl_codes_to_trans($gl_code, - $acc_name, $qe_line['dimension_id'], - $qe_line['dimension2_id'], $tax, $qe['description']); - } - } - if (strpos($qe_line['action'], '+')) - $base += $tax_total; - elseif (strpos($qe_line['action'], '-')) - $base -= $tax_total; - continue 2; - } - if ($type != QE_SUPPINV) - $cart->add_gl_item($qe_line['dest_id'], $qe_line['dimension_id'], - $qe_line['dimension2_id'], $part, $qe['description']); - else - { - $acc_name = get_gl_account_name($qe_line['dest_id']); - $cart->add_gl_codes_to_trans($qe_line['dest_id'], - $acc_name, $qe_line['dimension_id'], - $qe_line['dimension2_id'], $part, $qe['description']); - } - } -*/ } return $bank_amount; } -- 2.30.2