X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=a757baccd6b060a1cf582ffa34258c251e2f4071;hb=31629799f984d0237fe73f366d3d3d75448f1f34;hp=dce9fff41c88066886ef9d0b4664c0302c9ab7b6;hpb=c678e0167be0d6773ae1b3da6ab8f2750c21f757;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index dce9fff4..a757bacc 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,13 +1,22 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/admin/db/voiding_db.inc");
 include_once($path_to_root . "/includes/types.inc");
 
 //--------------------------------------------------------------------------------------
 
-function get_supplier_trans_view_str($type, $trans_no, $label="")
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	$viewer = "";
 	if ($type == systypes::po())
@@ -28,10 +37,10 @@ function get_supplier_trans_view_str($type, $trans_no, $label="")
 
 	if ($viewer != "")
 	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else
-			$preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no'>$label</a>";
+		$pars = access_string($label);
+		if (user_graphic_links() && $icon)
+			$pars[0] = set_icon($icon, $pars[0]);
+		$preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -43,17 +52,21 @@ function get_supplier_trans_view_str($type, $trans_no, $label="")
 
 function get_gl_view_str($type, $trans_no, $label="", $force=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	if (!$force && !user_show_gl_info())
 		return "";
 
+	$icon = false;
 	if ($label == "")
+	{
 		$label = _("GL");
-	if ($use_popup_windows)
-		$gl_view = "<a target='_blank' href='$path_to_root/gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-	else
-		$gl_view = "<a target='_blank' href='$path_to_root/gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no'>$label</a>";
+		$icon = ICON_GL;
+	}	
+	$pars = access_string($label);
+	if (user_graphic_links() && $icon)
+		$pars[0] = set_icon($icon, $pars[0]);
+	$gl_view = "<a target='_blank' href='$path_to_root/gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 
 	return $gl_view;
 }
@@ -69,9 +82,9 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_customer_trans_view_str($type, $trans_no, $label="")
+function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	$viewer = "";
 	if ($type == 10)
@@ -91,18 +104,18 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
 
   $lbl = $label;
   $preview_str = '';
+
   foreach($trans_no as $trans) {
 	if ($label == "")
 		$lbl = $trans;
-
 	if($preview_str!='') $preview_str .= ',';
 
 	if ($viewer != "")
 	{
-		if ($use_popup_windows)
-			$preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$lbl</a>";
-		else
-			$preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans'>$lbl</a>";
+		$pars = access_string($lbl);
+		if (user_graphic_links() && $icon)
+			$pars[0] = set_icon($icon, $pars[0]);
+		$preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans' onclick=\"javascript:openWindow(this.href,this.target); return false;\" $pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str .= $lbl;
@@ -113,9 +126,9 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_banking_trans_view_str($type, $trans_no, $label="")
+function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	$viewer = "";
 
@@ -135,10 +148,10 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
 
 	if ($viewer != "")
 	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else
-			$preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no'>$label</a>";
+		$pars = access_string($label);
+		if (user_graphic_links() && $icon)
+			$pars[0] = set_icon($icon, $pars[0]);
+		$preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -148,9 +161,9 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_inventory_trans_view_str($type, $trans_no, $label="")
+function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	$viewer = "";
 
@@ -166,10 +179,10 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
 
 	if ($viewer != "")
 	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else
-			$preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no'>$label</a>";
+		$pars = access_string($label);
+		if (user_graphic_links() && $icon)
+			$pars[0] = set_icon($icon, $pars[0]);
+		$preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -179,9 +192,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_manufacturing_trans_view_str($type, $trans_no, $label="")
+function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	$viewer = "";
 
@@ -199,10 +212,10 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
 
 	if ($viewer != "")
 	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else
-			$preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no'>$label</a>";
+		$pars = access_string($label);
+		if (user_graphic_links() && $icon)
+			$pars[0] = set_icon($icon, $pars[0]);
+		$preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -212,9 +225,9 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_dimensions_trans_view_str($type, $trans_no, $label="")
+function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	global $path_to_root, $use_popup_windows;
+	global $path_to_root;
 
 	$viewer = "";
 
@@ -228,10 +241,10 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="")
 
 	if ($viewer != "")
 	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else
-			$preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no'>$label</a>";
+		$pars = access_string($label);
+		if (user_graphic_links() && $icon)
+			$pars[0] = set_icon($icon, $pars[0]);
+		$preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -241,29 +254,29 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_trans_view_str($type, $trans_no, $label="")
+function get_trans_view_str($type, $trans_no, $label="", $icon=false)
 {
-	$view_str = get_customer_trans_view_str($type, $trans_no, $label);
+	$view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_supplier_trans_view_str($type, $trans_no, $label);
+	$view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_banking_trans_view_str($type, $trans_no, $label);
+	$view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_inventory_trans_view_str($type, $trans_no, $label);
+	$view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_manufacturing_trans_view_str($type, $trans_no, $label);
+	$view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_dimensions_trans_view_str($type, $trans_no, $label);
+	$view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon);
 	if ($view_str != null)
 		return $view_str;
 
@@ -271,37 +284,41 @@ function get_trans_view_str($type, $trans_no, $label="")
 }
 
 //--------------------------------------------------------------------------------------
-
-function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true)
+// Displays currency exchange rate for given date.
+// When there is no exrate for today, 
+// gets it form ECB and stores in local database.
+//
+function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=false)
 {
     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']))
-		{
-			$comp_currency = get_company_currency();
-			if ($from_currency == $comp_currency)
-				$currency = $to_currency;
-			else
-				$currency = $from_currency;
-			$rate = get_ecb_rate($currency);
-			if (get_date_exchange_rate($currency, $date_))
-				update_exchange_rate($currency, $date_, $rate, $rate);
-			else
-				add_exchange_rate($currency, $date_, $rate, $rate);
-			if ($from_currency == $comp_currency)
-				$rate = 1 / $rate;
-			$Ajax->activate('get_rate');
-		}
+		$comp_currency = get_company_currency();
+		if ($from_currency == $comp_currency)
+			$currency = $to_currency;
 		else
-			$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, $hint, true):""));
-	    if($buttons) {
-		  $Ajax->addUpdate('get_rate','_ex_rate', $rate);
+			$currency = $from_currency;
+		$rate = 0;
+		if ($date_ == Today()) {
+			$rate = get_date_exchange_rate($currency, $date_);
+			if (!$rate) {
+				$rate = get_ecb_rate($currency);
+				if ($rate) 
+					add_exchange_rate($currency, $date_, $rate, $rate);
+			}
 		}
+		if (!$rate)
+			$rate = get_exchange_rate_from_home_currency($currency, $date_);
+		if ($from_currency != $comp_currency)
+			$rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
+
+		$rate = number_format2($rate, user_exrate_dec());
+		if ($edit_rate)
+			text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); 
+		else
+    		label_row(_("Exchange Rate:"),"<span id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
+	  	$Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
 	}
 }
 
@@ -359,7 +376,7 @@ function get_comments_string($type, $type_no)
 
 //--------------------------------------------------------------------------------------
 
-function view_stock_status($stock_id, $description=null)
+function view_stock_status($stock_id, $description=null, $echo=true)
 {
 	global $path_to_root;
 	if ($description)
@@ -368,7 +385,9 @@ function view_stock_status($stock_id, $description=null)
 	else
 		//hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id");
 		$preview_str = "<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=$stock_id' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$stock_id</a>";
-	echo $preview_str;
+	if($echo)
+		echo $preview_str;
+	return $preview_str;
 }
 
 function view_stock_status_cell($stock_id, $description=null)
@@ -548,6 +567,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;
 }
 //
@@ -588,7 +609,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 +636,7 @@ function get_js_date_picker()
 ";
     add_js_source($js);
 
-    if (!file_exists($fpath)) {
+    if (!file_exists($fpath) || $go_debug) {
 
 	global $dateseps, $date_system;
 
@@ -838,6 +859,9 @@ function CC() {
 ";
 	$js .= "
       dateField.value = dateString;
+	  setFocus(dateField.name);
+	  if (dateField.className=='searchbox')
+	  	dateField.onblur();
       hide();
     }
     return;
@@ -998,19 +1022,19 @@ function CC() {
     if(document.getElementById){
       calendar = document.getElementById(calendarId);
       calendar.innerHTML = calendarDrawTable(currentYear, currentMonth);
-      setProperty('display', 'block');
       var fieldPos = new positionInfo(dateField);
       var calendarPos = new positionInfo(calendarId);
       var x = fieldPos.getElementLeft();
       var y = fieldPos.getElementBottom();
       setProperty('left', x + 'px');
       setProperty('top', y + 'px');
+      setProperty('display', 'block');
       if (document.all) {
-        setElementProperty('display', 'block', 'CCIframe');
         setElementProperty('left', x + 'px', 'CCIframe');
         setElementProperty('top', y + 'px', 'CCIframe');
         setElementProperty('width', calendarPos.getElementWidth() + 'px', 'CCIframe');
         setElementProperty('height', calendarPos.getElementHeight() + 'px', 'CCIframe');
+        setElementProperty('display', 'block', 'CCIframe');
       }
     }
   }
@@ -1071,9 +1095,10 @@ if (!function_exists('_vd'))
   	function _vd($mixed, $title = '', $exit = false)
   	{
     	// Only the site admin is able to proceed here.
-    	echo (!empty($title) ? ($title .':') : '') .'<pre>';
-    	var_dump($mixed);
-    	echo "</pre>\n";
+    	$str = (!empty($title) ? ($title .':') : '') .'<pre>';
+    	$str .= print_r($mixed, true); //var_dump($mixed);
+    	$str .= "</pre>\n";
+		display_error('<table><tr><td>'.$str.'</td></tr></table>');
     	if ($exit)
     		exit;
   	}