Removed obsolete submit_on_change option from sales_credit_note dimension lists.

[fa-stable.git] / includes / ui / ui_view.inc

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 5925579be558ed33433bbbf9d50e31d91c864972..645cff995074378264efc6e61fbb737815bb2a02 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -7,7 +7,7 @@ include_once($path_to_root . "/includes/types.inc");
 
 function get_supplier_trans_view_str($type, $trans_no, $label="")
 {
-       global $path_to_root, $use_popup_windows;
+       global $path_to_root;
 
        $viewer = "";
        if ($type == systypes::po())
@@ -28,10 +28,8 @@ 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);
+               $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 +41,15 @@ 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 "";
 
        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>";
+       $pars = access_string($label);
+       $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;
 }
@@ -71,7 +67,7 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
 
 function get_customer_trans_view_str($type, $trans_no, $label="")
 {
-       global $path_to_root, $use_popup_windows;
+       global $path_to_root;
 
        $viewer = "";
        if ($type == 10)
@@ -91,6 +87,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
 
   $lbl = $label;
   $preview_str = '';
+
   foreach($trans_no as $trans) {
        if ($label == "")
                $lbl = $trans;
@@ -99,10 +96,8 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
 
        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);
+               $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;
@@ -115,7 +110,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
 
 function get_banking_trans_view_str($type, $trans_no, $label="")
 {
-       global $path_to_root, $use_popup_windows;
+       global $path_to_root;
 
        $viewer = "";
 
@@ -135,10 +130,8 @@ 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);
+               $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;
@@ -150,7 +143,7 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
 
 function get_inventory_trans_view_str($type, $trans_no, $label="")
 {
-       global $path_to_root, $use_popup_windows;
+       global $path_to_root;
 
        $viewer = "";
 
@@ -166,10 +159,8 @@ 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);
+               $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;
@@ -181,7 +172,7 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
 
 function get_manufacturing_trans_view_str($type, $trans_no, $label="")
 {
-       global $path_to_root, $use_popup_windows;
+       global $path_to_root;
 
        $viewer = "";
 
@@ -199,10 +190,8 @@ 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);
+               $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;
@@ -214,7 +203,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
 
 function get_dimensions_trans_view_str($type, $trans_no, $label="")
 {
-       global $path_to_root, $use_popup_windows;
+       global $path_to_root;
 
        $viewer = "";
 
@@ -228,10 +217,8 @@ 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);
+               $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;
@@ -362,7 +349,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)
@@ -371,7 +358,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)