X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=186c7a1414d70b1f6ab7924e2468dcd1939bf1f2;hb=8110c7a16ca343e6a48658db2ab95a573e22118f;hp=66d42c7fefa37e8bbc18a1a9757fe7fd7467517f;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 66d42c7f..186c7a14 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -14,46 +14,34 @@ 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 = "$pars[0]";
- }
- 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 = "$pars[0]";
- 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 .= "$pars[0]";
- }
- 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";
@@ -138,145 +117,120 @@ function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
$viewer = "gl_payment_view.php";
elseif ($type == 2)
$viewer = "gl_deposit_view.php";
- elseif ($type == 0)
- $viewer = "";
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 = "$pars[0]";
- }
- 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 = "$pars[0]";
- }
- 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 = "$pars[0]";
- }
- 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/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 = "$pars[0]";
- }
+ return viewer_link($label, $viewer, $class, $id, $icon);
+}
+/*
+ Journal entry or cost update postings link
+*/
+function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
+{
+ if ($type == 0 || $type == 35)
+ $viewer = "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
else
- $preview_str = $label;
+ return null;
- return $preview_str;
+ if ($label == "")
+ $label = $trans_no;
+
+ 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, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_supplier_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_banking_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_inventory_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_manufacturing_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;
- $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
@@ -611,8 +565,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,
@@ -650,16 +604,12 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
function get_js_open_window($width, $height)
{
- $js = "\n\n";
+ . "}\n";
return $js;
}
@@ -674,17 +624,21 @@ 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) {
+ static $next;
+ if ($name==null)
+ $name = uniqid('_el',true);
if (!isset($_POST['_focus'])) {
set_focus($name);
}
+ return $name;
}
function get_js_png_fix()
{
- $js = "\n";
+ . "}\n";
return $js;
}
@@ -713,30 +666,6 @@ function get_js_date_picker()
global $comp_path, $go_debug;
$fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
- $js = "
-";
- add_js_source($js);
-
if (!file_exists($fpath) || $go_debug) {
global $dateseps, $date_system;
@@ -961,6 +890,8 @@ function CC() {
$js .= "
dateField.value = dateString;
setFocus(dateField.name);
+ if(dateField.getAttribute('aspect')=='cdate')
+ setElementProperty('color', (dateField.value==user.date ? 'black':'red'), dateField);
if (dateField.className=='searchbox')
dateField.onblur();
hide();