X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_view.inc;h=6c246f53e9b0e7e04ba8632272fa02aae50b28cc;hb=69cb44aa7570e2ce26f540014cd682bc21c2ad1c;hp=f34a443b47a45205922ffd9aa7d4acbba3fec8bf;hpb=7a50c189ea995d5fe6785feb7710c00396065d2b;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index f34a443b..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) @@ -90,6 +87,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="") $lbl = $label; $preview_str = ''; + foreach($trans_no as $trans) { if ($label == "") $lbl = $trans; @@ -98,10 +96,8 @@ function get_customer_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str .= "$lbl"; - else - $preview_str .= "$lbl"; + $pars = access_string($lbl); + $preview_str .= "$pars[0]"; } else $preview_str .= $lbl; @@ -114,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 = ""; @@ -134,10 +130,8 @@ 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; @@ -149,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 = ""; @@ -165,10 +159,8 @@ 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; @@ -180,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 = ""; @@ -198,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; @@ -213,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 = ""; @@ -227,10 +217,8 @@ 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; @@ -270,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); } } @@ -312,7 +309,7 @@ function is_voided_display($type, $id, $label) echo "