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

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 67bffa5e..1c63c2fc 100644
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_DIMTRANSVIEW';
 $path_to_root="../..";
 
 include($path_to_root . "/includes/db_pager.inc");
@@ -65,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();
@@ -85,18 +85,16 @@ if (!$outstanding_only)
 else
 	$_POST['OpenOnly'] = 1;
 
-submit_cells('SearchOrders', _("Search"), '', '', true);
+submit_cells('SearchOrders', _("Search"), '', '', 'default');
 
 end_row();
 end_table();
 
-end_form();
-
 $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)
@@ -118,13 +116,15 @@ 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"),
+	//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);
 }
 
@@ -139,7 +139,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)
@@ -152,14 +152,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']) . "'
@@ -172,7 +172,7 @@ $cols = array(
 	_("Name"), 
 	_("Type"), 
 	_("Date") =>'date',
-	_("Due Date") => array('name'=>'due_date', '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')
@@ -185,12 +185,7 @@ if ($outstanding_only) {
 $table =& new_db_pager('dim_tbl', $sql, $cols);
 $table->set_marker('is_overdue', _("Marked dimensions are overdue."));
 
-if (get_post('SearchOrders')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);