Access to system settings moved from global scope to SysPrefs.

[fa-stable.git] / dimensions / inquiry / search_dimensions.php

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 5498097a71b9e148762a5e202698f5e3cdb09a79..2d7c8541a9ced0c1645de5ce6cdebb61bdb86871 100644 (file)
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -18,20 +18,20 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 if (isset($_GET['outstanding_only']) && $_GET['outstanding_only'])
 {
        $outstanding_only = 1;
-       page(_("Search Outstanding Dimensions"), false, false, "", $js);
+       page(_($help_context = "Search Outstanding Dimensions"), false, false, "", $js);
 }
 else
 {
        $outstanding_only = 0;
-       page(_("Search Dimensions"), false, false, "", $js);
+       page(_($help_context = "Search Dimensions"), false, false, "", $js);
 }
 //-----------------------------------------------------------------------------------
 // Ajax updates
@@ -67,7 +67,7 @@ if (isset($_GET["stock_id"]))
 
 start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only");
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true);
@@ -90,8 +90,6 @@ submit_cells('SearchOrders', _("Search"), '', '', 'default');
 end_row();
 end_table();
 
-end_form();
-
 $dim = get_company_pref('use_dimension');
 
 function view_link($row) 
@@ -99,21 +97,14 @@ function view_link($row)
        return get_dimensions_trans_view_str(ST_DIMENSION, $row["id"]);
 }
 
-function is_closed($row)
+function sum_dimension($row) 
 {
-       return $row['closed'] ? _('Yes') : _('No');
+       return get_dimension_balance($row['id'], $_POST['FromDate'], $_POST['ToDate']); 
 }
 
-function sum_dimension($row) 
+function is_closed($row)
 {
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" .
-               date2sql($_POST['FromDate']) . "' AND
-               tran_date <= '" . date2sql($_POST['ToDate']) . "' AND (dimension_id = " .
-               $row['id']." OR dimension2_id = " .$row['id'].")";
-       $res = db_query($sql, "Sum of transactions could not be calculated");
-       $row = db_fetch_row($res);
-
-       return $row[0];
+       return $row['closed'] ? _('Yes') : _('No');
 }
 
 function is_overdue($row)
@@ -130,43 +121,8 @@ function edit_link($row)
                        "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT);
 }
 
-$sql = "SELECT dim.id,
-       dim.reference,
-       dim.name,
-       dim.type_,
-       dim.date_,
-       dim.due_date,
-       dim.closed
-       FROM ".TB_PREF."dimensions as dim WHERE id > 0";
-
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
-{
-       $sql .= " AND reference LIKE '%". $_POST['OrderNumber'] . "%'";
-} else {
-
-       if ($dim == 1)
-               $sql .= " AND type_=1";
-
-       if (isset($_POST['OpenOnly']))
-       {
-               $sql .= " AND closed=0";
-       }
-
-       if (isset($_POST['type_']) && ($_POST['type_'] > 0))
-       {
-               $sql .= " AND type_=" . $_POST['type_'];
-       }
-
-       if (isset($_POST['OverdueOnly']))
-       {
-               $today = date2sql(Today());
-
-               $sql .= " AND due_date < '$today' ";
-       }
-
-       $sql .= " AND date_ >= '" . date2sql($_POST['FromDate']) . "'
-               AND date_ <= '" . date2sql($_POST['ToDate']) . "'";
-}
+$sql = get_sql_for_search_dimensions($dim, $_POST['FromDate'], $_POST['ToDate'],
+       $_POST['OrderNumber'], $_POST['type_'], check_value('OpenOnly'), check_value('OverdueOnly'));
 
 $cols = array(
        _("#") => array('fun'=>'view_link'), 
@@ -188,11 +144,9 @@ $table =& new_db_pager('dim_tbl', $sql, $cols);
 $table->set_marker('is_overdue', _("Marked dimensions are overdue."));
 
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);
 
 end_form();
 end_page();
 
-?>