Merged changes from stable branch up to 2.3.23.

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 0b4f31138de66cae22ae324e81c4f559e2286144..16da77e4ff5851fd06d7828abde4a33a0505ded2 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -210,7 +210,7 @@ function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
                $label = _("Info");
 //             $icon = ICON_GL;
        }
-       return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
+       return viewer_link($label, "admin/view/view_package.php?id=$pkg", $class, $id, $icon);
 }
 
 
@@ -272,7 +272,7 @@ function check_ui_refresh($name=null)
 //
 function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
 {
-    global $Ajax, $xr_provider_authoritative;
+    global $Ajax, $SysPrefs;
 
        $readonly = false;
 
@@ -299,7 +299,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
                                        $rate = retrieve_exrate($currency, $date_);
                                        if (!$rate)
                                                display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
-                                       elseif ($xr_provider_authoritative) {
+                                       elseif ($SysPrefs->xr_provider_authoritative) {
                                                // if the remote exrate is considered authoritative we can store the rate here,
                                                // otherwise exrate will be stored during transaction write
                                                $readonly = true;
@@ -337,7 +337,7 @@ function is_voided_display($type, $id, $label)
        if ($void_entry == null)
                return false;
 
-       start_table(TABLESTYLE, "width=50%");
+       start_table(TABLESTYLE, "width='50%'");
        echo "<tr><td align=center><font color=red>$label</font><br>";
        echo "<font color=red>" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "</font><br>";
        if (strlen($void_entry["memo_"]) > 0)
@@ -424,6 +424,7 @@ function display_debit_or_credit_cells($value, $bold=false)
 function display_customer_trans_tax_details($tax_items, $columns)
 {
        global $SysPrefs;
+
        $first = true;
     while ($tax_item = db_fetch($tax_items))
     {
@@ -542,7 +543,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
 
     display_heading2($title);
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
 
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
        _("Left to Allocate"), _("This Allocation"));
@@ -888,13 +889,14 @@ function reset_focus()
 
 function get_js_date_picker()
 {
-    global $go_debug;
-    $fpath = user_js_cache().'/'.'date_picker.js';
+    global $SysPrefs, $tmonths;
 
-    if (!file_exists($fpath) || $go_debug) {
+    $fpath = user_js_cache().'/'.'date_picker.js';
 
-       global $dateseps, $date_system, $tmonths;
+    if (!file_exists($fpath) || $SysPrefs->go_debug) {
 
+       $date_system = $SysPrefs->date_system;
+       $dateseps = $SysPrefs->dateseps;
        $how = user_date_format();                              // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
        $sep = $dateseps[user_date_sep()];              // date separator
        $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 0 : 1));       // weekstart (sun = 0, mon = 1)