X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=a7495eab100e172acbdf4a9c3f0d47612a6b224b;hb=9451db1760036985de791ba24c442801e37f37de;hp=3d3acbe2a95e20d76d473584e6b0e1062db99dfd;hpb=029cbb368afc037bc9116b022744ee05ac5086e6;p=fa-stable.git diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 3d3acbe2..a7495eab 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -18,7 +18,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); if (user_use_date_picker()) $js .= get_js_date_picker(); @@ -26,7 +26,7 @@ page(_($help_context = "Search Purchase Orders"), false, false, "", $js); if (isset($_GET['order_number'])) { - $order_number = $_GET['order_number']; + $_POST['order_number'] = $_GET['order_number']; } //----------------------------------------------------------------------------------- @@ -60,7 +60,7 @@ start_table(TABLESTYLE_NOBORDER); start_row(); ref_cells(_("#:"), 'order_number', '',null, '', true); -date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); +date_cells(_("from:"), 'OrdersAfterDate', '', null, -user_transaction_days()); date_cells(_("to:"), 'OrdersToDate'); locations_list_cells(_("into location:"), 'StockLocation', null, true); @@ -104,11 +104,8 @@ function edit_link($row) { global $page_nested; - if ($page_nested) - return ''; - return pager_link( _("Edit"), - "/purchasing/po_entry_items.php?" . SID - . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT); + return $page_nested ? '' : + trans_editor_link(ST_PURCHORDER, $row["order_no"]); } function prt_link($row) @@ -119,8 +116,7 @@ function prt_link($row) //--------------------------------------------------------------------------------------------- $sql = get_sql_for_po_search_completed(get_post('OrdersAfterDate'), get_post('OrdersToDate'), - get_post('supplier_id') !== '' ? get_post('supplier_id') : ALL_TEXT, - get_post('StockLocation'), get_post('order_number'), get_post('SelectStockFromList')); + get_post('supplier_id'), get_post('StockLocation'), get_post('order_number'), get_post('SelectStockFromList')); $cols = array( _("#") => array('fun'=>'trans_view', 'ord'=>''), @@ -135,9 +131,10 @@ $cols = array( array('insert'=>true, 'fun'=>'prt_link'), ); -if (get_post('StockLocation') != $all_items) { +if (get_post('StockLocation') != ALL_TEXT) { $cols[_("Location")] = 'skip'; } + //--------------------------------------------------------------------------------------------------- $table =& new_db_pager('orders_tbl', $sql, $cols);