X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=05892e3ec90cb9cdb78db41f2cf37280422b4c1c;hb=825a4b279d6af05322188299f6a3967d2562f1e9;hp=b4e0d2f5cb5401d02c601f0435aca1f6ab7a0dd3;hpb=f0f460043b9bcb6153c0f6f82d4a74433efe4ad8;p=fa-stable.git

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index b4e0d2f5..05892e3e 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
@@ -62,7 +62,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);
 
@@ -79,8 +79,6 @@ submit_cells('SearchOrders', _("Search"),'',_('Select documents'),  'default');
 end_row();
 end_table();
 
-end_form();
-
 //-----------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -145,8 +143,8 @@ function costs_link($row)
 
 function view_gl_link($row)
 {
-	if ($row['closed'] == 0)
-		return '';
+	//if ($row['closed'] == 0)
+	//	return '';
 	return get_gl_view_str(ST_WORKORDER, $row['id']);
 }
 
@@ -155,55 +153,7 @@ function dec_amount($row, $amount)
 	return number_format2($amount, $row['decimals']);
 }
 
-$sql = "SELECT
-	workorder.id,
-	workorder.wo_ref,
-	workorder.type,
-	location.location_name,
-	item.description,
-	workorder.units_reqd,
-	workorder.units_issued,
-	workorder.date_,
-	workorder.required_by,
-	workorder.released_date,
-	workorder.closed,
-	workorder.released,
-	workorder.stock_id,
-	unit.decimals
-	FROM ".TB_PREF."workorders as workorder,"
-		.TB_PREF."stock_master as item,"
-		.TB_PREF."item_units as unit,"
-		.TB_PREF."locations as location
-	WHERE workorder.stock_id=item.stock_id 
-		AND workorder.loc_code=location.loc_code
-		AND item.units=unit.abbr";
-
-if (check_value('OpenOnly') || $outstanding_only != 0)
-{
-	$sql .= " AND workorder.closed=0";
-}
-
-if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
-{
-	$sql .= " AND workorder.loc_code='" . $_POST['StockLocation'] . "' ";
-}
-
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
-{
-	$sql .= " AND workorder.wo_ref LIKE '%". $_POST['OrderNumber'] . "%'";
-}
-
-if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items)
-{
-	$sql .= " AND workorder.stock_id='". $_POST['SelectedStockItem'] . "'";
-}
-
-if (check_value('OverdueOnly'))
-{
-	$Today = date2sql(Today());
-
-	$sql .= " AND workorder.required_by < '$Today' ";
-}
+$sql = get_sql_for_work_orders($outstanding_only, $all_items);
 
 $cols = array(
 	_("#") => array('fun'=>'view_link'), 
@@ -213,7 +163,7 @@ $cols = array(
 	_("Item") => array('fun'=>'view_stock'),
 	_("Required") => array('fun'=>'dec_amount', 'align'=>'right'),
 	_("Manufactured") => array('fun'=>'dec_amount', 'align'=>'right'),
-	_("Date") => 'date', 
+	_("Date") => array('name'=>'date_', 'type'=>'date', 'ord'=>'desc'), 
 	_("Required By") => array('type'=>'date', 'ord'=>''),
 	array('insert'=>true, 'fun'=> 'edit_link'),
 	array('insert'=>true, 'fun'=> 'release_link'),
@@ -226,7 +176,6 @@ $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked orders are overdue."));
 
 $table->width = "90%";
-start_form();
 
 display_db_pager($table);