From 1a2a0326b84927ccaaf01b52f0d3e97d7b782f47 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 27 Mar 2008 10:46:51 +0000
Subject: [PATCH] get_js_set_focus superseded  by js setFocus() and php
 set_focus()

---
 gl/inquiry/gl_account_inquiry.php | 5 +++--
 includes/page/footer.inc          | 1 +
 includes/systypes.inc             | 1 +
 includes/ui/ui_controls.inc       | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 6fedc61e..e91a59b2 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -11,13 +11,14 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
-$js = get_js_set_focus('account');
+$js = '';
+set_focus('account');
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
 
-page(_("General Ledger Account Inquiry"), false, false, "setFocus()", $js);
+page(_("General Ledger Account Inquiry"), false, false, '', $js);
 
 //----------------------------------------------------------------------------------------------------
 
diff --git a/includes/page/footer.inc b/includes/page/footer.inc
index 8f3db720..cefc3c1a 100644
--- a/includes/page/footer.inc
+++ b/includes/page/footer.inc
@@ -9,6 +9,7 @@ function page_footer($no_menu=false, $is_index=false)
 
 	if (isset($_GET['ajax'])) return;
 
+	echo set_js_focus();	// set focus on input (if $focus_on exists)
 	if (function_exists('hyperlink_back'))
 		hyperlink_back();
 	if ($no_menu == false) 
diff --git a/includes/systypes.inc b/includes/systypes.inc
index 3d459810..e7698231 100644
--- a/includes/systypes.inc
+++ b/includes/systypes.inc
@@ -48,6 +48,7 @@ function get_systype_db_info($type)
         case     28 : return array("".TB_PREF."wo_issues", null, "issue_no", "reference", "issue_date");
         case     29 : return array("".TB_PREF."wo_manufacture", null, "id", "reference", "date_");
         case     30 : return array("".TB_PREF."sales_orders", null, "order_no", "customer_ref", "ord_date");
+        case     31 : return array("".TB_PREF."service_orders", null, "order_no", "cust_ref", "date");
         case	 40 : return array("".TB_PREF."dimensions", null, "id", "reference", "date_");
         case     35 : return null;
 	}
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index f3731a86..12dc0d10 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -19,6 +19,8 @@ function start_form($multi=false, $sid=false, $action="", $name="")
 		echo "<form enctype='multipart/form-data' method='post' action='$action' $name>\n";	
 	else
 		echo "<form method='post' action='$action' $name>\n";	
+
+	echo "<input type=\"hidden\" id=\"_focus\" name=\"_focus\" value=\"\">";
 }
 
 //---------------------------------------------------------------------------------
-- 
2.30.2