X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_view.inc;h=6c246f53e9b0e7e04ba8632272fa02aae50b28cc;hb=69cb44aa7570e2ce26f540014cd682bc21c2ad1c;hp=f98970e6ceca016a7a07a556a94a7c38059a4a17;hpb=c7353ffde8fbcd970585936b006641dfaa1f7f77;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index f98970e6..6c246f53 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -1,12 +1,13 @@ $label"; - else - $preview_str = "$label"; - } + $pars = access_string($label); + $preview_str = "$pars[0]"; + } else $preview_str = $label; @@ -42,17 +41,15 @@ function get_supplier_trans_view_str($type, $trans_no, $label="") function get_gl_view_str($type, $trans_no, $label="", $force=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; if (!$force && !user_show_gl_info()) return ""; if ($label == "") $label = _("GL"); - if ($use_popup_windows) - $gl_view = "$label"; - else - $gl_view = "$label"; + $pars = access_string($label); + $gl_view = "$pars[0]"; return $gl_view; } @@ -70,7 +67,7 @@ function get_gl_view_str_cell($type, $trans_no, $label="") function get_customer_trans_view_str($type, $trans_no, $label="") { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; if ($type == 10) @@ -79,23 +76,32 @@ function get_customer_trans_view_str($type, $trans_no, $label="") $viewer = "view_credit.php"; elseif ($type == 12) $viewer = "view_receipt.php"; + elseif ($type == 13) + $viewer = "view_dispatch.php"; elseif ($type == 30) $viewer = "view_sales_order.php"; else return null; + if(!is_array($trans_no)) $trans_no = array($trans_no); + + $lbl = $label; + $preview_str = ''; + + foreach($trans_no as $trans) { if ($label == "") - $label = $trans_no; + $lbl = $trans; + + if($preview_str!='') $preview_str .= ','; if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; - } + $pars = access_string($lbl); + $preview_str .= "$pars[0]"; + } else - $preview_str = $label; + $preview_str .= $lbl; + } return $preview_str; } @@ -104,7 +110,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="") function get_banking_trans_view_str($type, $trans_no, $label="") { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -124,11 +130,9 @@ function get_banking_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; - } + $pars = access_string($label); + $preview_str = "$pars[0]"; + } else $preview_str = $label; @@ -139,7 +143,7 @@ function get_banking_trans_view_str($type, $trans_no, $label="") function get_inventory_trans_view_str($type, $trans_no, $label="") { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -155,11 +159,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; - } + $pars = access_string($label); + $preview_str = "$pars[0]"; + } else $preview_str = $label; @@ -170,7 +172,7 @@ function get_inventory_trans_view_str($type, $trans_no, $label="") function get_manufacturing_trans_view_str($type, $trans_no, $label="") { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -188,10 +190,8 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; + $pars = access_string($label); + $preview_str = "$pars[0]"; } else $preview_str = $label; @@ -203,7 +203,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="") function get_dimensions_trans_view_str($type, $trans_no, $label="") { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -217,11 +217,9 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; - } + $pars = access_string($label); + $preview_str = "$pars[0]"; + } else $preview_str = $label; @@ -260,31 +258,40 @@ function get_trans_view_str($type, $trans_no, $label="") } //-------------------------------------------------------------------------------------- - -function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true) +// Displays currency exchange rate for given date. +// 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_) { + global $Ajax; + if ($from_currency != $to_currency) { - if ($buttons && isset($_POST['get_rate'])) - { - $comp_currency = get_company_currency(); - if ($from_currency == $comp_currency) - $currency = $to_currency; - else - $currency = $from_currency; - $rate = get_ecb_rate($currency); - if (get_date_exchange_rate($currency, $date_)) - update_exchange_rate($currency, $date_, $rate, $rate); - else - add_exchange_rate($currency, $date_, $rate, $rate); - if ($from_currency == $comp_currency) - $rate = 1 / $rate; - } + $comp_currency = get_company_currency(); + if ($from_currency == $comp_currency) + $currency = $to_currency; else + $currency = $from_currency; + $rate = 0; + 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); + } + } + if (!$rate) $rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_); + + if ($from_currency == $comp_currency) + $rate = 1 / $rate; + $rate = number_format2($rate, user_exrate_dec()); - label_row(_("Exchange Rate:"),"1 " . $from_currency . " = " . $rate . " " . $to_currency . - ($buttons?" " . submit('get_rate',_("Get"), false):"")); + label_row(_("Exchange Rate:"),"1 " . $from_currency + . " = " . $rate . " " . $to_currency ); + $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); } } @@ -302,7 +309,7 @@ function is_voided_display($type, $id, $label) echo "$label
"; echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "
"; if (strlen($void_entry["memo_"]) > 0) - echo "
" . _("Memo:") . " " . $void_entry["memo_"] . "
"; + echo "
" . _("Memo:") . " " . $void_entry["memo_"] . "

"; echo ""; end_table(1); @@ -314,10 +321,10 @@ function is_voided_display($type, $id, $label) function comments_display_row($type, $id) { $comments = get_comments($type, $id); - if ($comments and db_num_rows($comments)) + if ($comments and db_num_rows($comments)) { echo ""; - while ($comment = db_fetch($comments)) + while ($comment = db_fetch($comments)) { echo $comment["memo_"] . "
"; } @@ -331,7 +338,7 @@ function get_comments_string($type, $type_no) { $str_return = ""; $result = get_comments($type, $type_no); - while ($comment = db_fetch($result)) + while ($comment = db_fetch($result)) { if (strlen($str_return)) $str_return = $str_return . " \n"; @@ -351,7 +358,7 @@ function view_stock_status($stock_id, $description=null) else //hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id"); $preview_str = "$stock_id"; - echo $preview_str; + echo $preview_str; } function view_stock_status_cell($stock_id, $description=null) @@ -369,12 +376,12 @@ function display_debit_or_credit_cells($value) { amount_cell($value); label_cell(""); - } + } elseif ($value < 0) { label_cell(""); amount_cell(abs($value)); - } + } else { //label_cell(""); @@ -387,7 +394,7 @@ function display_debit_or_credit_cells($value) function display_customer_trans_tax_details($tax_items, $columns) { - while ($tax_item = db_fetch($tax_items)) + while ($tax_item = db_fetch($tax_items)) { $tax = number_format2($tax_item['amount'],user_price_dec()); if ($tax_item['included_in_price']) @@ -403,7 +410,7 @@ function display_customer_trans_tax_details($tax_items, $columns) function display_supp_trans_tax_details($tax_items, $columns) { - while ($tax_item = db_fetch($tax_items)) + while ($tax_item = db_fetch($tax_items)) { $tax = number_format2(abs($tax_item['amount']),user_price_dec()); if ($tax_item['included_in_price']) @@ -417,21 +424,21 @@ function display_supp_trans_tax_details($tax_items, $columns) //-------------------------------------------------------------------------------------- -function display_edit_tax_items($taxes, $columns) +function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) { $total = 0; - foreach ($taxes as $taxitem) + foreach ($taxes as $taxitem) { - if ($taxitem['included_in_price']) + if ($tax_included) { label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) " . - _("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right"); - } - else + _("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan); + } + else { label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)", - number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right"); + number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan); $total += $taxitem['Value']; } } @@ -443,7 +450,6 @@ function display_edit_tax_items($taxes, $columns) function display_footer_exit() { - global $path_to_root; br(2); end_page(); exit; @@ -461,7 +467,7 @@ function display_allocations($alloc_result, $total) display_heading2(_("Allocations")); start_table("$table_style width=80%"); - + $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"), _("Left to Allocate"), _("This Allocation")); table_header($th); @@ -499,7 +505,7 @@ function display_allocations($alloc_result, $total) function display_allocations_from($person_type, $person_id, $type, $type_no, $total) { - switch ($person_type) + switch ($person_type) { case payment_person_types::customer() : $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type); @@ -512,22 +518,6 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to } } -function get_js_go_back() -{ - $js = "\n\n"; - return $js; -} - function get_js_open_window($width, $height) { $js = "\n\n"; return $js; } -function get_js_form_entry($edit_name, $sel_name, $next_name) -{ - $js = "\n\n"; - return $js; +/* + Setting focus on element $name in $form. + If $form<0 $name is element id. +*/ +function set_focus($name, $form_no=0) { + global $Ajax; + $Ajax->addFocus(true, $name); + $_POST['_focus'] = $name; } - -function get_js_set_focus($name) -{ - $js = "\n\n"; - return $js; +// +// Set default focus on first field $name if not set yet +// +function default_focus($name, $form_no=0) { + if (!isset($_POST['_focus'])) { + set_focus($name); + } } function get_js_png_fix() { $js = "\n"; return $js; -} +} function get_js_date_picker() { - global $dateseps; - //global $dateseps $path_to_root; - - //$encoding = "iso-8859-1"; // character encoding - //$encoding = $_SESSION['language']->encoding; // character encoding - //$dir = "ltr"; // left to right, right to left - //$dir = $_SESSION['language']->dir; // left to right, right to left - $how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw - $sep = $dateseps[user_date_sep()]; // date separator - $wstart = ($how == 0 ? 0 : 1); // weekstart (sun = 0, mon = 1) + global $comp_path, $go_debug; + $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js'; $js = " "; - $js .= " -"; - return $js; +document.write(\"
\");"; + + cache_js_file($fpath, $js); + } + add_js_ufile($fpath); + + return ''; } - + function alert($msg) { echo "\n\n"; -} +} -if (!function_exists('_vd')) +if (!function_exists('_vd')) { - function _vd($mixed, $title = '', $exit = false) + function _vd($mixed, $title = '', $exit = false) { // Only the site admin is able to proceed here. echo (!empty($title) ? ($title .':') : '') .'
';
     	var_dump($mixed);
     	echo "
\n"; - if ($exit) + if ($exit) exit; } }