X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=979f65872ed4f155ed0d53790504d8ad319e9c59;hb=36813770129eae719452f8d02144be61bbcd1d48;hp=5352cb91371cebd4ee9590ca625a2034614cb242;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 5352cb91..979f6587 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -51,7 +51,7 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $
 		$label = _("GL");
 		$icon = ICON_GL;
 	}
-	$url = ($type == ST_WORKORDER && !work_order_is_closed($trans_no)) ? "manufacturing/view/wo_costs_view.php?trans_no=$trans_no"
+	$url = ($type == ST_WORKORDER) ? "manufacturing/view/wo_costs_view.php?trans_no=$trans_no"
 		: "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
 
 	return viewer_link($label, $url, $class, $id, $icon);
@@ -278,7 +278,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
 
 	if ($from_currency != $to_currency)
 	{
-	 	$rate = get_post('_ex_rate');
+	 	$rate = input_num('_ex_rate');
 	 	if (check_ui_refresh() || !$rate) { // readonly or ui context changed
 			$comp_currency = get_company_currency();
 			if ($from_currency == $comp_currency)
@@ -560,7 +560,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
     	if ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT)
     		$alloc_row['Total'] = -$alloc_row['Total'];
     	amount_cell($alloc_row['Total']);
-   		amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+   		amount_cell($alloc_row['Total'] - $alloc_row['alloc']);
     	amount_cell($alloc_row['amt']);
     	end_row();
 
@@ -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) 
@@ -888,6 +888,71 @@ function get_js_open_window($width, $height)
 		. " var top = (screen.height - $height) / 2;\n"
 		. " return window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
 		. "}\n";
+  	$js .= get_js_lookup_window();
+	return $js;
+}
+
+function get_js_lookup_window() {
+  	$js = "function lookupWindow(url, title) {
+    	var u = url.split('#');
+    	if (u.length == 2) {
+      		var element = document.getElementById(u[1]);
+      		var options = element.options;
+      		url = u[0] + '&' + u[1] + '=' + options[element.selectedIndex].value;
+    	}
+    	openWindow(url, title);
+	}";
+	return $js;
+}
+
+function get_js_select_combo_item() {
+	$js = "function selectComboItem(doc, client_id, value){
+    	var element = doc.getElementById(client_id);
+		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;
+}
+/* for space search option */
+function get_js_set_combo_item() {
+	$js = "function setComboItem(doc, client_id, value, text){
+    	var element = doc.getElementById(client_id);
+  		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;
 }
 
@@ -1390,6 +1455,14 @@ function changeCCYear(change) {
 function changeCCMonth(change) {
   cC.changeMonth(change);
 }
+window.addEventListener('click', function(e) {
+  if (document.getElementById('CC').contains(e.target)){} else {
+    if (cC.visible()) {
+      cC.hide();
+    }
+  }
+});
+
 document.write(\"<iframe id='CCIframe' src='javascript:false;' frameBorder='0' scrolling='no'></iframe>\");
 document.write(\"<div id='CC'></div>\");";
 
@@ -1497,7 +1570,7 @@ function trans_editor_link($type, $trans_no)
 	//   35=> Cost Update,
 	);
 
-	return !isset($editor_url[$type]) ? '' :
+	return !isset($editor_url[$type]) ? '--' :
 		(is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) :
 			pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT));
 }