X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search.php;h=71228317d99a9eee0aecec8164ed32169e318931;hb=577328a5a3a3d5cd6e2252798a355fa20a8f591e;hp=2cd7223a59635e7bdc654441127a9f83544a469f;hpb=7eb7d3b1b680e17ba618b1a3f670f335eceb330e;p=fa-stable.git diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index 2cd7223a..71228317 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -18,9 +18,9 @@ include($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 ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); page(_($help_context = "Search Outstanding Purchase Orders"), false, false, "", $js); @@ -61,7 +61,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(_("Location:"), 'StockLocation', null, true); @@ -73,6 +73,8 @@ start_row(); stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); +supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true); + submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(1); @@ -84,8 +86,7 @@ function trans_view($trans) function edit_link($row) { - return pager_link( _("Edit"), - "/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT); + return trans_editor_link(ST_PURCHORDER, $trans["order_no"]); } function prt_link($row) @@ -105,23 +106,9 @@ function check_overdue($row) } //--------------------------------------------------------------------------------------------- -if (isset($_POST['order_number']) && ($_POST['order_number'] != "")) -{ - $order_number = $_POST['order_number']; -} - -if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && - ($_POST['SelectStockFromList'] != $all_items)) -{ - $selected_stock_item = $_POST['SelectStockFromList']; -} -else -{ - unset($selected_stock_item); -} - //figure out the sql required from the inputs available -$sql = get_sql_for_po_search(); +$sql = get_sql_for_po_search(get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('supplier_id'), get_post('StockLocation'), + $_POST['order_number'], get_post('SelectStockFromList')); //$result = db_query($sql,"No orders were returned"); @@ -153,4 +140,3 @@ display_db_pager($table); end_form(); end_page(); -?>