X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=dimensions%2Finquiry%2Fsearch_dimensions.php;h=752b5507ab2574ab164425d76aa1efd8583a5d90;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=547493309dd2ec0078dac43f680fdf72475fdfe5;hpb=b1167086b19280eb898396e3af6470975ff74571;p=fa-stable.git

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 54749330..752b5507 100644
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -1,6 +1,15 @@
 <?php
-
-$page_security = 2;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_DIMTRANSVIEW';
 $path_to_root="../..";
 
 include($path_to_root . "/includes/db_pager.inc");
@@ -56,7 +65,7 @@ if (isset($_GET["stock_id"]))
 
 //--------------------------------------------------------------------------------------
 
-start_form(false, true, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only . SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only");
 
 start_table("class='tablestyle_noborder'");
 start_row();
@@ -76,7 +85,7 @@ if (!$outstanding_only)
 else
 	$_POST['OpenOnly'] = 1;
 
-submit_cells('SearchOrders', _("Search"), '', '', true);
+submit_cells('SearchOrders', _("Search"), '', '', 'default');
 
 end_row();
 end_table();
@@ -87,7 +96,7 @@ $dim = get_company_pref('use_dimension');
 
 function view_link($row) 
 {
-	return get_dimensions_trans_view_str(systypes::dimension(), $row["id"]);
+	return get_dimensions_trans_view_str(ST_DIMENSION, $row["id"]);
 }
 
 function is_closed($row)
@@ -109,14 +118,16 @@ function sum_dimension($row)
 
 function is_overdue($row)
 {
-	return date_diff(Today(), sql2date($row["due_date"]), "d") > 0;
+	return date_diff2(Today(), sql2date($row["due_date"]), "d") > 0;
 }
 
 function edit_link($row)
 {
-	return $row["closed"] ?  '' :
-		pager_link(_("Edit"),
-			"/dimensions/dimension_entry.php?trans_no=" . $row["id"]);
+	//return $row["closed"] ?  '' :
+	//	pager_link(_("Edit"),
+	//		"/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT);
+	return pager_link(_("Edit"),
+			"/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT);
 }
 
 $sql = "SELECT dim.id,
@@ -130,7 +141,7 @@ $sql = "SELECT dim.id,
 
 if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
 {
-	$sql .= " AND reference LIKE '%". $_POST['OrderNumber'] . "%'";
+	$sql .= " AND reference LIKE ".db_escape("%". $_POST['OrderNumber'] . "%");
 } else {
 
 	if ($dim == 1)
@@ -143,14 +154,14 @@ if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
 
 	if (isset($_POST['type_']) && ($_POST['type_'] > 0))
 	{
-   		$sql .= " AND type_=" . $_POST['type_'];
+   		$sql .= " AND type_=".db_escape($_POST['type_']);
 	}
 
 	if (isset($_POST['OverdueOnly']))
 	{
 		$today = date2sql(Today());
 
-	   	$sql .= " AND due_date < '$today' ";
+	   	$sql .= " AND due_date < '$today'";
 	}
 
 	$sql .= " AND date_ >= '" . date2sql($_POST['FromDate']) . "'
@@ -163,7 +174,7 @@ $cols = array(
 	_("Name"), 
 	_("Type"), 
 	_("Date") =>'date',
-	_("Due Date") => array('date', 'ord'=>'asc'), 
+	_("Due Date") => array('name'=>'due_date', 'type'=>'date', 'ord'=>'asc'), 
 	_("Closed") => array('fun'=>'is_closed'),
 	_("Balance") => array('type'=>'amount', 'insert'=>true, 'fun'=>'sum_dimension'),
 	array('insert'=>true, 'fun'=>'edit_link')
@@ -176,6 +187,7 @@ if ($outstanding_only) {
 $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);