X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=98af52cc0971042c18765dddfa1def692e97c9ec;hb=e91772a2716825a6aeb358d1defba47d5f3892c1;hp=b5c98534603071b2ee663969f9129f1deb7765d4;hpb=a578378e067a6af5bbdcdb5881632c29494a8aa1;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index b5c98534..98af52cc 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -1,59 +1,47 @@ . + See the License here . ***********************************************************************/ include_once($path_to_root . "/admin/db/voiding_db.inc"); include_once($path_to_root . "/includes/types.inc"); //-------------------------------------------------------------------------------------- -function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false, + $class='', $id='') { - global $path_to_root; - - $viewer = ""; + $viewer = "purchasing/view/"; if ($type == systypes::po()) - $viewer = "view_po.php"; + $viewer .= "view_po.php"; elseif ($type == 20) - $viewer = "view_supp_invoice.php"; + $viewer .= "view_supp_invoice.php"; elseif ($type == 21) - $viewer = "view_supp_credit.php"; + $viewer .= "view_supp_credit.php"; elseif ($type == 22) $viewer = "view_supp_payment.php"; elseif ($type == 25) - $viewer = "view_grn.php"; + $viewer .= "view_grn.php"; else return null; + $viewer .= "?trans_no=$trans_no"; if ($label == "") $label = $trans_no; - if ($viewer != "") - { - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $preview_str = "$pars[0]"; - } - else - $preview_str = $label; - - return $preview_str; + return viewer_link($label, $viewer, $class, $id, $icon); } //-------------------------------------------------------------------------------------- -function get_gl_view_str($type, $trans_no, $label="", $force=false) +function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $id='') { - global $path_to_root; - if (!$force && !user_show_gl_info()) return ""; @@ -63,12 +51,10 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false) $label = _("GL"); $icon = ICON_GL; } - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $gl_view = "$pars[0]"; - return $gl_view; + return viewer_link($label, + "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no", + $class, $id, $icon); } //-------------------------------------------------------------------------------------- @@ -82,21 +68,21 @@ function get_gl_view_str_cell($type, $trans_no, $label="") //-------------------------------------------------------------------------------------- -function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, + $class='', $id='') { - global $path_to_root; + $viewer = "sales/view/"; - $viewer = ""; if ($type == 10) - $viewer = "view_invoice.php"; + $viewer .= "view_invoice.php"; elseif ($type == 11) - $viewer = "view_credit.php"; + $viewer .= "view_credit.php"; elseif ($type == 12) - $viewer = "view_receipt.php"; + $viewer .= "view_receipt.php"; elseif ($type == 13) - $viewer = "view_dispatch.php"; + $viewer .= "view_dispatch.php"; elseif ($type == 30) - $viewer = "view_sales_order.php"; + $viewer .= "view_sales_order.php"; else return null; @@ -110,27 +96,20 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false) $lbl = $trans; if($preview_str!='') $preview_str .= ','; - if ($viewer != "") - { - $pars = access_string($lbl); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $preview_str .= "$pars[0]"; - } - else - $preview_str .= $lbl; - } + $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans", + $class, $id, $icon); - return $preview_str; + } + return $preview_str; } //-------------------------------------------------------------------------------------- -function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_banking_trans_view_str($type, $trans_no, $label="", + $icon=false, $class='', $id='') { - global $path_to_root; - - $viewer = ""; + if ($label == "") + $label = $trans_no; if ($type == 4) $viewer = "bank_transfer_view.php"; @@ -139,144 +118,101 @@ function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false) elseif ($type == 2) $viewer = "gl_deposit_view.php"; elseif ($type == 0) - $viewer = ""; + return $label; else return null; - if ($label == "") - $label = $trans_no; - - if ($viewer != "") - { - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $preview_str = "$pars[0]"; - } - else - $preview_str = $label; - - return $preview_str; + return viewer_link($label, "gl/view/$viewer?trans_no=$trans_no", + $class, $id, $icon); } //-------------------------------------------------------------------------------------- -function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_inventory_trans_view_str($type, $trans_no, $label="", + $icon=false, $class='', $id='') { - global $path_to_root; - - $viewer = ""; + $viewer = "inventory/view/"; if ($type == systypes::inventory_adjustment()) - $viewer = "view_adjustment.php"; + $viewer .= "view_adjustment.php"; elseif ($type == systypes::location_transfer()) - $viewer = "view_transfer.php"; + $viewer .= "view_transfer.php"; else return null; + $viewer .= "?trans_no=$trans_no"; if ($label == "") $label = $trans_no; - if ($viewer != "") - { - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $preview_str = "$pars[0]"; - } - else - $preview_str = $label; - - return $preview_str; + return viewer_link($label, $viewer, $class, $id, $icon); } //-------------------------------------------------------------------------------------- -function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_manufacturing_trans_view_str($type, $trans_no, $label="", + $icon=false, $class='', $id='') { - global $path_to_root; - - $viewer = ""; + $viewer = "manufacturing/view/"; if ($type == 28) - $viewer = "wo_issue_view.php"; + $viewer .= "wo_issue_view.php"; elseif ($type == 29) - $viewer = "wo_production_view.php"; + $viewer .= "wo_production_view.php"; elseif ($type == systypes::work_order()) - $viewer = "work_order_view.php"; + $viewer .= "work_order_view.php"; else return null; + $viewer .= "?trans_no=$trans_no"; + if ($label == "") $label = $trans_no; - if ($viewer != "") - { - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $preview_str = "$pars[0]"; - } - else - $preview_str = $label; - - return $preview_str; + return viewer_link($label, $viewer, $class, $id, $icon); } //-------------------------------------------------------------------------------------- -function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false, + $class='', $id='') { - global $path_to_root; - - $viewer = ""; - if ($type == 40) - $viewer = "view_dimension.php"; + $viewer = "dimensions/view_dimension.php?trans_no=$trans_no"; else return null; if ($label == "") $label = $trans_no; - if ($viewer != "") - { - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = "\n"; - $preview_str = "$pars[0]"; - } - else - $preview_str = $label; - - return $preview_str; + return viewer_link($label, $viewer, $class, $id, $icon); } //-------------------------------------------------------------------------------------- -function get_trans_view_str($type, $trans_no, $label="", $icon=false) +function get_trans_view_str($type, $trans_no, $label="", $icon=false, + $class='', $id='') { - $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; @@ -288,7 +224,7 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false) // When there is no exrate for today, // gets it form ECB and stores in local database. // -function exchange_rate_display($from_currency, $to_currency, $date_) +function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=false) { global $Ajax; @@ -309,15 +245,16 @@ function exchange_rate_display($from_currency, $to_currency, $date_) } } if (!$rate) - $rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_); - - if ($from_currency == $comp_currency) - $rate = 1 / $rate; + $rate = get_exchange_rate_from_home_currency($currency, $date_); + if ($from_currency != $comp_currency) + $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_)); $rate = number_format2($rate, user_exrate_dec()); - label_row(_("Exchange Rate:"),"1 " . $from_currency - . " = " . $rate . " " . $to_currency ); - $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); + if ($edit_rate) + text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); + else + label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" ); + $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); } } @@ -443,7 +380,7 @@ function display_supp_trans_tax_details($tax_items, $columns) $tax = number_format2(abs($tax_item['amount']),user_price_dec()); if ($tax_item['included_in_price']) label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " . - _("Amount:") . ": $tax", "colspan=$columns align=right", "align=right"); + _("Amount") . ": $tax", "colspan=$columns align=right", "align=right"); else label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)", $tax, "colspan=$columns align=right", "align=right"); @@ -467,7 +404,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) { label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)", number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan); - $total += $taxitem['Value']; + $total += round2($taxitem['Value'], user_price_dec()); } } @@ -509,6 +446,8 @@ function display_allocations($alloc_result, $total) label_cell(systypes::name($alloc_row['type'])); label_cell(get_trans_view_str($alloc_row['type'],$alloc_row['trans_no'])); label_cell(sql2date($alloc_row['tran_date'])); + $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec()); + $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec()); amount_cell($alloc_row['Total']); //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']); amount_cell($alloc_row['Total'] - $alloc_row['amt']); @@ -523,6 +462,7 @@ function display_allocations($alloc_result, $total) end_row(); start_row(); label_cell(_("Left to Allocate:"), "align=right colspan=5"); + $total = round2($total, user_price_dec()); amount_cell($total - $total_allocated); end_row(); @@ -546,6 +486,104 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to } } +//-------------------------------------------------------------------------------------- +// +// Expands selected quick entry $id into GL posings and adds to cart. +// returns calculated amount posted to bank GL account. +// +function display_quick_entries(&$cart, $id, $base, $type, $descr='') +{ + $bank_amount = 0; + + if (!isset($id) || $id == null || $id == "") + { + display_error( _("No Quick Entries are defined.")); + set_focus('totamount'); + } + else + { + if ($type == QE_DEPOSIT) + $base = -$base; + if ($type != QE_SUPPINV) // only one quick entry on journal/bank transaction + $cart->clear_items(); + $qe = get_quick_entry($id); + if ($descr != '') $qe['description'] .= ': '.$descr; + $qe_lines = get_quick_entry_lines($id); + 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']); + $tax_total = 0; + foreach ($taxes as $index => $item_tax) { + if(substr($qe_line['action'],0,1) != 'T') + $tax = round2($base * $item_tax['rate'] + / ($item_tax['rate'] + 100), user_price_dec()); + else + $tax = round2($base * $item_tax['rate'] / 100, 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 ($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; +} + + function get_js_open_window($width, $height) { $js = "\n