X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=960afb0b4e052fe66e9766af99419565bf6a9538;hb=41bdd7820211334cef5c087889e6cd5e6e45af86;hp=b65339ef8fc09cabceae106b4fa119550ddedbd3;hpb=9738f7d64641df18b688f0d03a3b62c93f40e0c7;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index b65339ef..960afb0b 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -832,7 +832,7 @@ function _number_to_words($number)
         "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", 
         "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", 
         "Nineteen"); 
-    $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty", 
+    $tens = array("", "", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", 
         "Seventy", "Eighty", "Ninety"); 
 
     if ($Dn || $n) 
@@ -908,13 +908,23 @@ function get_js_lookup_window() {
 function get_js_select_combo_item() {
 	$js = "function selectComboItem(doc, client_id, value){
     	var element = doc.getElementById(client_id);
-		var options = element.options;
-		for (var i = 0, optionsLength = options.length; i < optionsLength; i++) {
-			if (options[i].value == value) {
-				element.selectedIndex = i;
-        		element.onchange();
+		if (typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT' ){
+			var options = element.options;
+			for (var i = 0, optionsLength = options.length; i < optionsLength; i++) {
+				if (options[i].value == value) {
+					element.selectedIndex = i;
+	        		element.onchange();
+				}
 			}
-		}
+		} else {			
+			var stock_element = doc.getElementsByName('stock_id');
+	    	if( stock_element.length > 0) {
+				stock_element.value = value;	
+				var stock_id = doc.getElementById('_stock_id_edit'); 
+				stock_id.value=value;
+				stock_id.onblur();		
+			}
+		}			
 		window.close();
 	}";
 	return $js;
@@ -923,14 +933,24 @@ function get_js_select_combo_item() {
 function get_js_set_combo_item() {
 	$js = "function setComboItem(doc, client_id, value, text){
     	var element = doc.getElementById(client_id);
- 		var options = element.options;
- 		options.length = 0;
- 		var option = doc.createElement('option');
-		option.value = value;
-		option.text = text;
-    	element.add(option, 0);
-		element.selectedIndex = 0;
-        element.onchange();
+  		if(typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT') {
+	 		var options = element.options;
+	 		options.length = 0;
+	 		var option = doc.createElement('option');
+			option.value = value;
+			option.text = text;
+	   		element.add(option, 0);
+			element.selectedIndex = 0;
+	        element.onchange();
+	    } else {
+			var stock_element = doc.getElementsByName('stock_id');
+	    	if( stock_element.length > 0) {
+				stock_element[0].value = value;	
+				var stock_id = doc.getElementById('_stock_id_edit'); 
+				stock_id.value=value;
+				stock_id.onblur();					
+			}
+ 		}
 		window.close();
 	}";
 	return $js;
@@ -1546,44 +1566,3 @@ function trans_editor_link($type, $trans_no)
 		(is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) :
 			pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT));
 }
-
-// This script updates the browser history when
-// any of the passed variables change.
-// This way, if the user changes these variables,
-// then uses the back button to return, it returns to the page
-// as the user modified it.
-function get_js_history(...$vars)
-{
-    $js = ' 
-    function changeVar() {
-        var stateObj = { foo: "bar" };
-        var state = "";
-';
-
-    $first = true;
-    foreach ( $vars as $var ) {
-        $js .= '
-        var element = document.getElementsByName("' . $var. '");
-        if (element[0])';
-        if ($first) {
-            $first = false;
-            $js .= '
-            state += "' . basename($_SERVER['SCRIPT_NAME']) . "?";
-        } else
-            $js .= '
-            state += "&';
-        $js .= $var .'="' . ' + element[0].value;';
-    }
-
-    $js .= '
-        history.replaceState(stateObj, "page 2", state);
-    }';
-    return $js;
-}
-
-function set_posts(...$vars)
-{
-    foreach ( $vars as $var )
-        if (isset($_GET[$var]))
-            $_POST[$var] = $_GET[$var];
-}