Fixed mysqli related warnings.

[fa-stable.git] / purchasing / inquiry / po_search_completed.php

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 03ab7b0ec2a5bd8fa1bb2bb5e14cc185e3f73611..a7495eab100e172acbdf4a9c3f0d47612a6b224b 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -16,18 +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");
-if (!@$_GET['popup'])
-{
-       $js = "";
-       if ($use_popup_windows)
-               $js .= get_js_open_window(900, 500);
-       if ($use_date_picker)
-               $js .= get_js_date_picker();
-       page(_($help_context = "Search Purchase Orders"), false, false, "", $js);
-}
+
+$js = "";
+if ($SysPrefs->use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+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'];
 }
 
 //-----------------------------------------------------------------------------------
@@ -55,14 +54,13 @@ if (get_post('SearchOrders'))
 }
 //---------------------------------------------------------------------------------------------
 
-if (!@$_GET['popup'])
-       start_form();
+start_form();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'order_number', '',null, '', true);
 
-date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
+date_cells(_("from:"), 'OrdersAfterDate', '', null, -user_transaction_days());
 date_cells(_("to:"), 'OrdersToDate');
 
 locations_list_cells(_("into location:"), 'StockLocation', null, true);
@@ -74,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');
@@ -95,8 +93,8 @@ else
 {
        unset($selected_stock_item);
 }
-
 //---------------------------------------------------------------------------------------------
+
 function trans_view($trans)
 {
        return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
@@ -104,11 +102,10 @@ function trans_view($trans)
 
 function edit_link($row) 
 {
-       if (@$_GET['popup'])
-               return '';
-       return pager_link( _("Edit"),
-               "/purchasing/po_entry_items.php?" . SID 
-               . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+       global $page_nested;
+
+       return $page_nested ? '' :
+               trans_editor_link(ST_PURCHORDER, $row["order_no"]);
 }
 
 function prt_link($row)
@@ -118,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'=>''), 
@@ -133,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);
@@ -144,9 +143,5 @@ $table->width = "80%";
 
 display_db_pager($table);
 
-if (!@$_GET['popup'])
-{
-       end_form();
-       end_page();
-}      
-?>
+end_form();
+end_page();