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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 979f6587..513052dd 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -281,6 +281,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
 	 	$rate = input_num('_ex_rate');
 	 	if (check_ui_refresh() || !$rate) { // readonly or ui context changed
 			$comp_currency = get_company_currency();
+
+	 		if (!isset($from_currency))
+	 			$from_currency = $comp_currency;
+	 		if (!isset($to_currency))
+	 			$to_currency = $comp_currency;
+
 			if ($from_currency == $comp_currency)
 				$currency = $to_currency;
 			else
@@ -919,7 +925,7 @@ function get_js_select_combo_item() {
 		} else {			
 			var stock_element = doc.getElementsByName('stock_id');
 	    	if( stock_element.length > 0) {
-				stock_element.value = value;	
+				stock_element[0].value = value;	
 				var stock_id = doc.getElementById('_stock_id_edit'); 
 				stock_id.value=value;
 				stock_id.onblur();		
@@ -933,6 +939,7 @@ 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 search = doc.getElementById('_'+client_id+'_edit');
   		if(typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT') {
 	 		var options = element.options;
 	 		options.length = 0;
@@ -941,6 +948,7 @@ function get_js_set_combo_item() {
 			option.text = text;
 	   		element.add(option, 0);
 			element.selectedIndex = 0;
+			search.value = '';
 	        element.onchange();
 	    } else {
 			var stock_element = doc.getElementsByName('stock_id');
@@ -1497,7 +1505,7 @@ if (!function_exists('_vd'))
 
 function _vl($mixed, $title = '', $exit = false)
 {
-	error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true));
+	error_log((!empty($title) ? ($title .':') : '') . print_r($mixed, true));
 	if ($exit)
 		exit;
 }
@@ -1574,3 +1582,21 @@ 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));
 }
+
+function company_logo_on_view()
+{
+	// Display View Header
+	global $SysPrefs;
+
+	$logo = company_path() . "/images/" . $SysPrefs->prefs['coy_logo'];
+	$nl = 1;
+	if (!empty($SysPrefs->prefs['company_logo_report']) && $SysPrefs->prefs['coy_logo'] != '' && file_exists($logo))
+	{
+		$size = getimagesize($logo);
+		$height = $size[0] > 150 ? $size[1] * 150 / $size[0] : 30; 
+		$text = "<img src='$logo' height=$height>";
+	}
+	else
+		$text = $SysPrefs->prefs['coy_name'];
+	display_note($text, 0, $nl, "style='font-size:16px;font-weight:600'");
+}
\ No newline at end of file