X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=bedf484a9c9112144ff7da880852e119b82473bb;hb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;hp=47e3267274211c24e77f35ffa2e0fdc6f4c2f876;hpb=e43afae15592be88fe3fda57db92068d5d85b8ab;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 47e32672..bedf484a 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"; + $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] = set_icon($icon, $pars[0]); - $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] = set_icon($icon, $pars[0]); - $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"; - elseif ($type == 30) - $viewer = "view_sales_order.php"; + $viewer .= "view_dispatch.php"; + elseif ($type == 30 || $type == 32) + $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] = set_icon($icon, $pars[0]); - $preview_str .= "$pars[0]"; - } - else - $preview_str .= $lbl; - } + $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans&trans_type=$type", + $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"; @@ -138,145 +117,120 @@ function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false) $viewer = "gl_payment_view.php"; elseif ($type == 2) $viewer = "gl_deposit_view.php"; - elseif ($type == 0) - $viewer = ""; else return null; - if ($label == "") - $label = $trans_no; - - if ($viewer != "") - { - $pars = access_string($label); - if (user_graphic_links() && $icon) - $pars[0] = set_icon($icon, $pars[0]); - $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] = set_icon($icon, $pars[0]); - $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] = set_icon($icon, $pars[0]); - $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/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] = set_icon($icon, $pars[0]); - $preview_str = "$pars[0]"; - } + return viewer_link($label, $viewer, $class, $id, $icon); +} +/* + Journal entry or cost update postings link +*/ +function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false, + $class='', $id='') +{ + if ($type == 0 || $type == 35) + $viewer = "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no"; else - $preview_str = $label; + return null; - return $preview_str; + if ($label == "") + $label = $trans_no; + + 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, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_supplier_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_banking_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_inventory_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_manufacturing_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; - $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon); + $view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; @@ -303,9 +257,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate= if ($date_ == Today()) { $rate = get_date_exchange_rate($currency, $date_); if (!$rate) { - $rate = get_ecb_rate($currency); - if ($rate) - add_exchange_rate($currency, $date_, $rate, $rate); + $row = get_currency($currency); + if ($row['auto_update']) { + $rate = retrieve_exrate($currency, $date_); + if ($rate) + add_exchange_rate($currency, $date_, $rate, $rate); + } } } if (!$rate) @@ -317,7 +274,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_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" ); + label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" ); $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); } } @@ -401,7 +358,8 @@ function view_stock_status_cell($stock_id, $description=null) function display_debit_or_credit_cells($value) { - if ($value > 0) + $value = round2($value, user_price_dec()); + if ($value >= 0) { amount_cell($value); label_cell(""); @@ -411,12 +369,6 @@ function display_debit_or_credit_cells($value) label_cell(""); amount_cell(abs($value)); } - else - { - //label_cell(""); - amount_cell(0); - label_cell(""); - } } //-------------------------------------------------------------------------------------- @@ -468,7 +420,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()); } } @@ -510,6 +462,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']); @@ -524,6 +478,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(); @@ -569,7 +524,109 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $cart->clear_items(); $qe = get_quick_entry($id); if ($descr != '') $qe['description'] .= ': '.$descr; - $qe_lines = get_quick_entry_lines($id); + $result = get_quick_entry_lines($id); + $totrate = 0; + while ($row = db_fetch($result)) + { + $qe_lines[] = $row; + + switch (strtolower($row['action'])) { + case "t": // post taxes calculated on base amount + case "t+": // ditto & increase base amount + case "t-": // ditto & reduce base amount + if (substr($row['action'],0,1) != 'T') + $totrate += get_tax_type_default_rate($row['dest_id']); + } + } + $first = true; + $taxbase = 0; + foreach($qe_lines as $qe_line) + { + 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 + if ($first) + { + $taxbase = $base/($totrate+100); + $first = false; + } + + if (substr($qe_line['action'],0,1) != 'T') + $part = $taxbase; + else + $part = $base; + $item_tax = get_tax_type($qe_line['dest_id']); + if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T') + { + $taxgroup = $cart->tax_group_id; + $rates = 0; + $res = get_tax_group_items($cart->tax_group_id); + while ($row = db_fetch($res)) + $rates += $row['rate']; + if ($rates == 0) + continue 2; + } + $tax = round2($part * $item_tax['rate'], user_price_dec()); + if ($tax==0) continue 2; + $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) + ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code']; + if (!is_tax_gl_unique($gl_code)) { + display_error(_("Cannot post to GL account used by more than one tax type.")); + break 2; + } + 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; + elseif (strpos($qe_line['action'], '-')) + $base -= $tax; + 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']); + } + } +/* while ($qe_line = db_fetch($qe_lines)) { switch (strtolower($qe_line['action'])) { @@ -599,18 +656,32 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') 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']); + //$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) { - 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 - ? $item_tax['purchasing_gl_code'] : $item_tax['sales_gl_code']; + $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'], @@ -640,6 +711,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $qe_line['dimension2_id'], $part, $qe['description']); } } +*/ } return $bank_amount; } @@ -647,16 +719,12 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') function get_js_open_window($width, $height) { - $js = "\n\n"; + . "}\n"; return $js; } @@ -671,17 +739,28 @@ function set_focus($name, $form_no=0) { } // // Set default focus on first field $name if not set yet -// -function default_focus($name, $form_no=0) { +// Returns unique name if $name=null +// +function default_focus($name=null, $form_no=0) { + static $next; + if ($name==null) + $name = uniqid('_el',true); if (!isset($_POST['_focus'])) { set_focus($name); } + return $name; +} +/* + Reset focus to next control element (e.g. link). +*/ +function reset_focus() +{ + unset($_POST['_focus']); } function get_js_png_fix() { - $js = "\n"; + . "}\n"; return $js; } @@ -710,30 +788,6 @@ function get_js_date_picker() global $comp_path, $go_debug; $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js'; - $js = " -"; - add_js_source($js); - if (!file_exists($fpath) || $go_debug) { global $dateseps, $date_system; @@ -958,6 +1012,8 @@ function CC() { $js .= " dateField.value = dateString; setFocus(dateField.name); + if(dateField.getAttribute('aspect')=='cdate') + setElementProperty('color', (dateField.value==user.date ? 'black':'red'), dateField); if (dateField.className=='searchbox') dateField.onblur(); hide();