X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=3fdbf1df1db44d1c2c524625868a7ba69f890d5f;hb=cae3ea743a1a1c96a4e679e2378c758500cd233e;hp=e03538b5508a3fa13330c920c86625b847b28ab3;hpb=61af570a407ed30eaad4816a4394af267ec45e67;p=fa-stable.git

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index e03538b5..3fdbf1df 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -23,12 +23,12 @@ if (isset($_GET['outstanding_only']) && ($_GET['outstanding_only'] == true))
 {
 // curently outstanding simply means not closed
 	$outstanding_only = 1;
-	page(_("Search Outstanding Work Orders"), false, false, "", $js);
+	page(_($help_context = "Search Outstanding Work Orders"), false, false, "", $js);
 }
 else
 {
 	$outstanding_only = 0;
-	page(_("Search Work Orders"), false, false, "", $js);
+	page(_($help_context = "Search Work Orders"), false, false, "", $js);
 }
 //-----------------------------------------------------------------------------------
 // Ajax updates
@@ -79,8 +79,6 @@ submit_cells('SearchOrders', _("Search"),'',_('Select documents'),  'default');
 end_row();
 end_table();
 
-end_form();
-
 //-----------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -90,7 +88,7 @@ function check_overdue($row)
 
 function view_link($dummy, $order_no)
 {
-	return get_trans_view_str(systypes::work_order(), $order_no);
+	return get_trans_view_str(ST_WORKORDER, $order_no);
 }
 
 function view_stock($row)
@@ -100,7 +98,9 @@ function view_stock($row)
 
 function wo_type_name($dummy, $type)
 {
-	return wo_types::name($type);
+	global $wo_types_array;
+	
+	return $wo_types_array[$type];
 }
 
 function edit_link($row)
@@ -134,7 +134,7 @@ function costs_link($row)
 	return $row["closed"] || !$row["released"] ? '' :
 		pager_link(_('Costs'),
 			"/gl/gl_bank.php?NewPayment=1&PayType=" 
-			.payment_person_types::WorkOrder(). "&PayPerson=" .$row["id"]);
+			.PT_WORKORDER. "&PayPerson=" .$row["id"]);
 */			
 	return $row["closed"] || !$row["released"] ? '' :
 		pager_link(_('Costs'),
@@ -145,7 +145,7 @@ function view_gl_link($row)
 {
 	if ($row['closed'] == 0)
 		return '';
-	return get_gl_view_str(systypes::work_order(), $row['id']);
+	return get_gl_view_str(ST_WORKORDER, $row['id']);
 }
 
 function dec_amount($row, $amount)
@@ -183,17 +183,17 @@ if (check_value('OpenOnly') || $outstanding_only != 0)
 
 if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
 {
-	$sql .= " AND workorder.loc_code='" . $_POST['StockLocation'] . "' ";
+	$sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']);
 }
 
 if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
 {
-	$sql .= " AND workorder.wo_ref LIKE '%". $_POST['OrderNumber'] . "%'";
+	$sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%');
 }
 
 if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items)
 {
-	$sql .= " AND workorder.stock_id='". $_POST['SelectedStockItem'] . "'";
+	$sql .= " AND workorder.stock_id=".db_escape($_POST['SelectedStockItem']);
 }
 
 if (check_value('OverdueOnly'))
@@ -223,12 +223,7 @@ $cols = array(
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked orders are overdue."));
 
-if (get_post('SearchOrders')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "90%";
-start_form();
 
 display_db_pager($table);