Delete fiscal year buttons prepared for final js confirmation dialog.

[fa-stable.git] / includes / ui / ui_view.inc

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index e2265f9d62522b1454f59a0718a5ec173a15de1e..99111d9d03efb9b560bcdf7cf3be23c1a35a529b 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -117,8 +117,6 @@ function get_banking_trans_view_str($type, $trans_no, $label="",
                $viewer = "gl_payment_view.php";
        elseif ($type == 2)
                $viewer = "gl_deposit_view.php";
-       elseif ($type == 0)
-               return $label;
        else
                return null;
 
@@ -177,7 +175,23 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false,
        $class='', $id='')
 {
        if ($type == 40)
-               $viewer = "dimensions/view_dimension.php?trans_no=$trans_no";
+               $viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no";
+       else
+               return null;
+
+       if ($label == "")
+               $label = $trans_no;
+
+       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
                return null;
 
@@ -216,6 +230,10 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false,
        if ($view_str != null)
                return $view_str;
 
+       $view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
+       if ($view_str != null)
+               return $view_str;
+
        return null;
 }
 
@@ -239,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)
@@ -617,6 +638,13 @@ function default_focus($name=null, $form_no=0) {
     }
        return $name;
 }
+/*
+       Reset focus to next control element (e.g. link).
+*/
+function reset_focus()
+{
+       unset($_POST['_focus']);
+}
 
 function get_js_png_fix()
 {