X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=d1262f1240a6122fe4dbb89f1fffec118f911f61;hb=02e49d757dc1f8a46258df7c77714d2b75554a83;hp=63040d18d996e825fe66e833757a51ceb5795240;hpb=a4db318fa0c84e099e0970ca82e36215782d661e;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 63040d18..d1262f12 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,59 +1,47 @@
 <?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.
+	Released under the terms of the GNU General Public License, GPL, 
+	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>.
+    See the License here <http://www.gnu.org/licenses/gpl-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="", $icon=false)
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	global $path_to_root;
-
-	$viewer = "";
+	$viewer = "purchasing/view/";
 	if ($type == systypes::po())
-		$viewer = "view_po.php";
+		$viewer .= "view_po.php";
 	elseif ($type == 20)
-		$viewer = "view_supp_invoice.php";
+		$viewer .= "view_supp_invoice.php";
 	elseif ($type == 21)
-		$viewer = "view_supp_credit.php";
+		$viewer .= "view_supp_credit.php";
 	elseif ($type == 22)
 		$viewer = "view_supp_payment.php";
 	elseif ($type == 25)
-		$viewer = "view_grn.php";
+		$viewer .= "view_grn.php";
 	else
 		return null;
+	$viewer .= "?trans_no=$trans_no";
 
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		$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;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_gl_view_str($type, $trans_no, $label="", $force=false)
+function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $id='')
 {
-	global $path_to_root;
-
 	if (!$force && !user_show_gl_info())
 		return "";
 
@@ -63,12 +51,10 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false)
 		$label = _("GL");
 		$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;
+	return viewer_link($label, 
+		"gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no", 
+		$class, $id, $icon);
 }
 
 //--------------------------------------------------------------------------------------
@@ -82,21 +68,21 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	global $path_to_root;
+	$viewer = "sales/view/";
 
-	$viewer = "";
 	if ($type == 10)
-		$viewer = "view_invoice.php";
+		$viewer .= "view_invoice.php";
 	elseif ($type == 11)
-		$viewer = "view_credit.php";
+		$viewer .= "view_credit.php";
 	elseif ($type == 12)
-		$viewer = "view_receipt.php";
+		$viewer .= "view_receipt.php";
 	elseif ($type == 13)
-		$viewer = "view_dispatch.php";
+		$viewer .= "view_dispatch.php";
 	elseif ($type == 30)
-		$viewer = "view_sales_order.php";
+		$viewer .= "view_sales_order.php";
 	else
 		return null;
 
@@ -110,27 +96,20 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
 		$lbl = $trans;
 	if($preview_str!='') $preview_str .= ',';
 
-	if ($viewer != "")
-	{
-		$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;
-  }
+	$preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans", 
+		$class, $id, $icon);
 
-	return $preview_str;
+  }
+  return $preview_str;
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_banking_trans_view_str($type, $trans_no, $label="", 
+	$icon=false, $class='', $id='')
 {
-	global $path_to_root;
-
-	$viewer = "";
+	if ($label == "")
+		$label = $trans_no;
 
 	if ($type == 4)
 		$viewer = "bank_transfer_view.php";
@@ -139,144 +118,101 @@ function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
 	elseif ($type == 2)
 		$viewer = "gl_deposit_view.php";
 	elseif ($type == 0)
-		$viewer = "";
+		return $label;
 	else
 		return null;
 
-	if ($label == "")
-		$label = $trans_no;
-
-	if ($viewer != "")
-	{
-		$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;
-
-	return $preview_str;
+	return viewer_link($label, "gl/view/$viewer?trans_no=$trans_no", 
+		$class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_inventory_trans_view_str($type, $trans_no, $label="", 
+	$icon=false, $class='', $id='')
 {
-	global $path_to_root;
-
-	$viewer = "";
+	$viewer = "inventory/view/";
 
 	if ($type == systypes::inventory_adjustment())
-		$viewer = "view_adjustment.php";
+		$viewer .= "view_adjustment.php";
 	elseif ($type == systypes::location_transfer())
-		$viewer = "view_transfer.php";
+		$viewer .= "view_transfer.php";
 	else
 		return null;
+	$viewer .= "?trans_no=$trans_no";
 
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		$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;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_manufacturing_trans_view_str($type, $trans_no, $label="", 
+	$icon=false, $class='', $id='')
 {
-	global $path_to_root;
-
-	$viewer = "";
+	$viewer = "manufacturing/view/";
 
 	if ($type == 28)
-		$viewer = "wo_issue_view.php";
+		$viewer .= "wo_issue_view.php";
 	elseif ($type == 29)
-		$viewer = "wo_production_view.php";
+		$viewer .= "wo_production_view.php";
 	elseif ($type == systypes::work_order())
-		$viewer = "work_order_view.php";
+		$viewer .= "work_order_view.php";
 	else
 		return null;
 
+	$viewer .= "?trans_no=$trans_no";
+
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		$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;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	global $path_to_root;
-
-	$viewer = "";
-
 	if ($type == 40)
-		$viewer = "view_dimension.php";
+		$viewer = "dimensions/view_dimension.php?trans_no=$trans_no";
 	else
 		return null;
 
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		$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;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	$view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon);
+	$view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon);
+	$view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon);
+	$view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon);
+	$view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon);
+	$view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon);
+	$view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
@@ -611,8 +547,8 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
 						else
 							$tax = round2($base * $item_tax['rate'] / 100,  user_price_dec());
 
-						$gl_code = $type != QE_DEPOSIT 
-							? $item_tax['purchasing_gl_code'] : $item_tax['sales_gl_code'];
+						$gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
+							? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
 						$tax_total += $tax;
 						if ($type != QE_SUPPINV)
 							$cart->add_gl_item($gl_code, 
@@ -674,11 +610,15 @@ function set_focus($name, $form_no=0) {
 }
 //
 //	Set default focus on first field $name if not set yet
-//
-function default_focus($name, $form_no=0) {
+//	Returns unique name if $name=null
+//	
+function default_focus($name=null, $form_no=0) {
+	if ($name==null) 
+		$name = uniqid('_el');
     if (!isset($_POST['_focus'])) {
 	  set_focus($name);
     }
+	return $name;
 }
 
 function get_js_png_fix()
@@ -713,30 +653,6 @@ function get_js_date_picker()
     global $comp_path, $go_debug;
     $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
 
-	$js = "<style>
-#CCIframe { display: none; left: 0px; position: absolute; top: 0px; height: 250px; width: 270px; z-index: 99;}
-#CC { position:absolute; background-color:#FFF; margin:0; padding:0; display:none; z-index: 100;}
-#CC table { font-family: arial, verdana, helvetica, sans-serif;font-size: 8pt; border-left: 1px solid #336; border-right: 1px solid #336;}
-#CC th { font-weight: normal; text-align: center;}
-#CC th a { font-weight: normal; text-decoration: none; color: #FFF; padding: 1px;}
-#CC td { text-align: center;}
-#CC .header { background-color: #336;}
-#CC .weekday { background-color: #DDD; color: #000;}
-#CC .weekend { background-color: #FFC; color: #000;}
-#CC .weekno { background-color: #c0daf8; color: #555;}
-#CC .current { border: 1px solid #339; background-color: #336; color: #FFF;}
-#CC .weekday,#CC .weekend,#CC .current { display: block; text-decoration: none; border: 1px solid #FFF; width: 2em;}
-#CC .weekday:hover,#CC .weekend:hover,#CC .current:hover { color: #FFF; background-color: #336; border: 1px solid #999;}
-#CC .previous { text-align: left;}
-#CC .next { text-align: right;}
-#CC .previous,#CC .next { padding: 1px 3px 1px 3px; font-size: 1.4em;}
-#CC .previous a,#CC .next a { color: #FFF; text-decoration: none; font-weight: bold;}
-#CC .title { text-align: center; font-weight: bold; color: #FFF;}
-#CC .empty { background-color: #CCC; border: 1px solid #FFF;}
-</style>
-";
-    add_js_source($js);
-
     if (!file_exists($fpath) || $go_debug) {
 
 	global $dateseps, $date_system;