X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Finquiry%2Fsearch_dimensions.php;h=ea1781a10d305153ecefc444e5ae1679dfc04a22;hb=ae115f787d84c11c6140137b054261a398b2f077;hp=1c63c2fc89171f7019a3accdedcf2db29378ec06;hpb=9437de4193bde74b4a77e6ddcafede09b500c241;p=fa-stable.git

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 1c63c2fc..ea1781a1 100644
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -20,18 +20,18 @@ include_once($path_to_root . "/includes/ui.inc");
 $js = "";
 if ($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);
@@ -97,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)
@@ -128,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 ".db_escape("%". $_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_=".db_escape($_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'), 
@@ -192,4 +150,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>