Added 'View Attachments' if any in all popup view windows

[fa-stable.git] / manufacturing / search_work_orders.php

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index cf93441cfaa7332ef74cc7f5e020667a52e9e1a7..f212a1a842d5cb8e04dcc8cef864d81a73f1af56 100644 (file)
--- 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)
 {
@@ -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=".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'), 
@@ -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);