Fixed AltGr hotkeys system issue.

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index b5c98534603071b2ee663969f9129f1deb7765d4..a757baccd6b060a1cf582ffa34258c251e2f4071 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,6 +1,6 @@
 <?php
 /**********************************************************************
-    Copyright (C) 2005-2008  FrontAccounting, LLC.
+    Copyright (C) FrontAccounting, LLC.
        Released under the terms of the GNU Affero General Public License,
        AGPL, as published by the Free Software Foundation, either version 
        3 of the License, or (at your option) any later version.
@@ -39,7 +39,7 @@ function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false)
        {
                $pars = access_string($label);
                if (user_graphic_links() && $icon)
-                       $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+                       $pars[0] = set_icon($icon, $pars[0]);
                $preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
        }
        else
@@ -65,7 +65,7 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false)
        }       
        $pars = access_string($label);
        if (user_graphic_links() && $icon)
-               $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+               $pars[0] = set_icon($icon, $pars[0]);
        $gl_view = "<a target='_blank' href='$path_to_root/gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 
        return $gl_view;
@@ -114,7 +114,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
        {
                $pars = access_string($lbl);
                if (user_graphic_links() && $icon)
-                       $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+                       $pars[0] = set_icon($icon, $pars[0]);
                $preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans' onclick=\"javascript:openWindow(this.href,this.target); return false;\" $pars[1]>$pars[0]</a>";
        }
        else
@@ -150,7 +150,7 @@ function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
        {
                $pars = access_string($label);
                if (user_graphic_links() && $icon)
-                       $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+                       $pars[0] = set_icon($icon, $pars[0]);
                $preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
        }
        else
@@ -181,7 +181,7 @@ function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
        {
                $pars = access_string($label);
                if (user_graphic_links() && $icon)
-                       $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+                       $pars[0] = set_icon($icon, $pars[0]);
                $preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
        }
        else
@@ -214,7 +214,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=fal
        {
                $pars = access_string($label);
                if (user_graphic_links() && $icon)
-                       $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+                       $pars[0] = set_icon($icon, $pars[0]);
                $preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
        }
        else
@@ -243,7 +243,7 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
        {
                $pars = access_string($label);
                if (user_graphic_links() && $icon)
-                       $pars[0] = "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0' title='$pars[0]' />\n";
+                       $pars[0] = set_icon($icon, $pars[0]);
                $preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
        }
        else
@@ -288,7 +288,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 +309,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 
-                       . " = <span id='_ex_rate'>" . $rate . "</span> " . $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:"),"<span id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
+               $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
        }
 }
 
@@ -1094,9 +1095,10 @@ if (!function_exists('_vd'))
        function _vd($mixed, $title = '', $exit = false)
        {
        // Only the site admin is able to proceed here.
-       echo (!empty($title) ? ($title .':') : '') .'<pre>';
-       var_dump($mixed);
-       echo "</pre>\n";
+       $str = (!empty($title) ? ($title .':') : '') .'<pre>';
+       $str .= print_r($mixed, true); //var_dump($mixed);
+       $str .= "</pre>\n";
+               display_error('<table><tr><td>'.$str.'</td></tr></table>');
        if ($exit)
                exit;
        }