X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=7ca792aee8e30cd76afdd4a81d76d7f4bc888f4e;hb=d58850256e3c216df162c35524beebe10e9f7b25;hp=0832c3f35ed1ef5a261acd34d7d4716b3080c461;hpb=8fd0c50cc4a19a07c61ee87a632377419d096a5a;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 0832c3f3..7ca792ae 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -275,7 +275,7 @@ function get_trans_view_str($type, $trans_no, $label="")
 function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true)
 {
     global $Ajax;
-
+    $hint = _('Get daily ECB exchange rate and save for later use in invoicing process');
 	if ($from_currency != $to_currency)
 	{
 		if ($buttons && isset($_POST['get_rate']))
@@ -298,7 +298,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=tr
 			$rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
 		$rate = number_format2($rate, user_exrate_dec());
     	label_row(_("Exchange Rate:"),"1 " . $from_currency . " = <span id='_ex_rate'>" . $rate . "</span> " . $to_currency .
-			($buttons?"  " . submit('get_rate',_("Get"), false, true):""));
+		($buttons?"  " . submit('get_rate',_("Get"), false, $hint, true):""));
 	    if($buttons) {
 		  $Ajax->addUpdate('get_rate','_ex_rate', $rate);
 		}
@@ -536,7 +536,7 @@ function get_js_open_window($width, $height)
 		. "{\n"
 		. " var left = (screen.width - $width) / 2;\n"
 		. " var top = (screen.height - $height) / 2;\n"
-		. " window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
+		. " return window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
 		. "}\n"
 		. "-->\n"
 		. "</script>\n";
@@ -548,6 +548,8 @@ function get_js_open_window($width, $height)
   If $form<0 $name is element id.
 */
 function set_focus($name, $form_no=0) {
+  global $Ajax;
+	$Ajax->addFocus(true, $name);
     $_POST['_focus'] = $name;
 }
 //
@@ -555,7 +557,7 @@ function set_focus($name, $form_no=0) {
 //
 function default_focus($name, $form_no=0) {
     if (!isset($_POST['_focus'])) {
-	$_POST['_focus'] = $name;
+	  set_focus($name);
     }
 }
 
@@ -588,7 +590,7 @@ function get_js_png_fix()
 
 function get_js_date_picker()
 {
-    global $comp_path;
+    global $comp_path, $go_debug;
     $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
 
 	$js = "<style>
@@ -615,7 +617,7 @@ function get_js_date_picker()
 ";
     add_js_source($js);
 
-    if (!file_exists($fpath)) {
+    if (!file_exists($fpath) || $go_debug) {
 
 	global $dateseps, $date_system;