X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=05892e3ec90cb9cdb78db41f2cf37280422b4c1c;hb=46c5f7a65a7659a44ae8254c63152074363d3987;hp=447dbd0782cbedf4013bb08fda3e87a99426356c;hpb=54d84ff9a67620ab38c676cdbcf87853632724f0;p=fa-stable.git

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 447dbd07..05892e3e 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_MANUFTRANSVIEW';
+$path_to_root = "..";
 include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
@@ -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
@@ -60,9 +60,9 @@ if (isset($_GET["stock_id"]))
 
 //--------------------------------------------------------------------------------------
 
-start_form(false, false, $_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_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true);
 
@@ -75,22 +75,20 @@ if ($outstanding_only==0)
 
 stock_manufactured_items_list_cells(_("for item:"), 'SelectedStockItem', null, true);
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'),  'default');
 end_row();
 end_table();
 
-end_form();
-
 //-----------------------------------------------------------------------------
 function check_overdue($row)
 {
 	return (!$row["closed"] 
-		&& date_diff(Today(), sql2date($row["required_by"]), "d") > 0);
+		&& date_diff2(Today(), sql2date($row["required_by"]), "d") > 0);
 }
 
 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'),
@@ -143,9 +143,9 @@ function costs_link($row)
 
 function view_gl_link($row)
 {
-	if ($row['closed'] == 0)
-		return '';
-	return get_gl_view_str(systypes::work_order(), $row['id']);
+	//if ($row['closed'] == 0)
+	//	return '';
+	return get_gl_view_str(ST_WORKORDER, $row['id']);
 }
 
 function dec_amount($row, $amount)
@@ -153,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=".db_escape($_POST['StockLocation']);
-}
-
-if (isset($_POST['OrderNumber']) && $_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=".db_escape($_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'), 
@@ -211,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'),
@@ -223,12 +175,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);