X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=7a89e4eb9986aa29b555f4285409c15d442915fe;hb=c8145b03ed9754bd9552ccdac38b41b73550a69f;hp=31c774263c967f2a834a326f8fa21cbe02699bbc;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 31c77426..7a89e4eb 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -16,6 +16,7 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); + $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); @@ -25,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']; } //----------------------------------------------------------------------------------- @@ -71,7 +72,7 @@ start_row(); stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true); -if (!@$_GET['popup']) +if (!$page_nested) supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true); submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); @@ -92,8 +93,8 @@ else { unset($selected_stock_item); } - //--------------------------------------------------------------------------------------------- + function trans_view($trans) { return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]); @@ -103,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, $trans["order_no"]); } function prt_link($row) @@ -117,7 +115,8 @@ function prt_link($row) //--------------------------------------------------------------------------------------------- -$sql = get_sql_for_po_search_completed(!@$_GET['popup'] ? $_POST['supplier_id'] : ALL_TEXT); +$sql = get_sql_for_po_search_completed(get_post('OrdersAfterDate'), get_post('OrdersToDate'), + get_post('supplier_id'), get_post('StockLocation'), get_post('order_number'), get_post('SelectStockFromList')); $cols = array( _("#") => array('fun'=>'trans_view', 'ord'=>''), @@ -145,4 +144,3 @@ display_db_pager($table); end_form(); end_page(); -?>