X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fsearch_work_orders.php;h=1c407b6487eb81087249a0dcd10bdcd2280db564;hb=268a54dcfd08aff7113bc3afe8b784f36db2d0d4;hp=921783db20f25f2988a5dcf8c71d9ee1975cd7d0;hpb=795cb201893b54ea61d93b74b20fa09df515c310;p=fa-stable.git diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index 921783db..1c407b64 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -1,34 +1,34 @@ . + See the License here . ***********************************************************************/ -$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"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(800, 500); 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,14 +60,20 @@ 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(_("#:"), 'OrderId', '',null, '', true); ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true); locations_list_cells(_("at Location:"), 'StockLocation', null, true); +end_row(); +end_table(); +start_table(TABLESTYLE_NOBORDER); +start_row(); + check_cells( _("Only Overdue:"), 'OverdueOnly', null); if ($outstanding_only==0) @@ -75,22 +81,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,14 +104,15 @@ 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) { return $row['closed'] ? ''._('Closed').'' : - pager_link(_("Edit"), - "/manufacturing/work_order_entry.php?trans_no=" . $row["id"], ICON_EDIT); + trans_editor_link(ST_WORKORDER, $row["id"]); } function release_link($row) @@ -132,93 +137,45 @@ 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"]); + "/manufacturing/work_order_costs.php?trans_no=" .$row["id"]); } -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) +function view_gl_link($row) { - $sql .= " AND workorder.closed=0"; + return get_gl_view_str(ST_WORKORDER, $row['id']); } -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) +function dec_amount($row, $amount) { - $sql .= " AND workorder.stock_id='". $_POST['SelectedStockItem'] . "'"; + return number_format2($amount, $row['decimals']); } -if (check_value('OverdueOnly')) -{ - $Today = date2sql(Today()); - - $sql .= " AND workorder.required_by < '$Today' "; -} +$sql = get_sql_for_work_orders($outstanding_only, get_post('SelectedStockItem'), get_post('StockLocation'), + get_post('OrderId'), get_post('OrderNumber'), check_value('OverdueOnly')); $cols = array( - _("#") => array('fun'=>'view_link'), + _("#") => array('fun'=>'view_link', 'ord'=>''), _("Reference"), // viewlink 2 ? _("Type") => array('fun'=>'wo_type_name'), _("Location"), - _("Item") => array('fun'=>'view_stock'), + _("Item") => array('fun'=>'view_stock', 'ord'=>''), _("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'), + array('insert'=>true, 'fun'=> 'costs_link'), array('insert'=>true, 'fun'=> 'produce_link'), - array('insert'=>true, 'fun'=> 'costs_link') + array('insert'=>true, 'fun'=> 'view_gl_link') ); $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); end_form(); end_page(); -?>