X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=7a89e4eb9986aa29b555f4285409c15d442915fe;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=90d869aa907acbe5cf0452e0e4047e293b59913b;hpb=90b3d069d96b99671af51726e2953352738abb75;p=fa-stable.git diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 90d869aa..7a89e4eb 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -16,16 +16,17 @@ 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); -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); 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']; } //----------------------------------------------------------------------------------- @@ -59,7 +60,7 @@ start_table(TABLESTYLE_NOBORDER); start_row(); ref_cells(_("#:"), 'order_number', '',null, '', true); -date_cells(_("from:"), 'OrdersAfterDate', '', null, -30); +date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'OrdersToDate'); locations_list_cells(_("into location:"), 'StockLocation', null, true); @@ -71,6 +72,9 @@ start_row(); stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true); +if (!$page_nested) + supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true); + submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(1); @@ -89,8 +93,8 @@ else { unset($selected_stock_item); } - //--------------------------------------------------------------------------------------------- + function trans_view($trans) { return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]); @@ -100,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) @@ -114,7 +115,8 @@ function prt_link($row) //--------------------------------------------------------------------------------------------- -$sql = get_sql_for_po_search_completed(); +$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'=>''), @@ -142,4 +144,3 @@ display_db_pager($table); end_form(); end_page(); -?>