X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=8c939aba7717cc474867caf8750512813b3b150f;hb=443214a800fa66cd1473b48f6fadd1b09144a5d4;hp=9925ac6399a393387a286074b120a8e11c0e1492;hpb=cfedd5f88e44b4dfa5453dea789fe600f76c3331;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 9925ac63..8c939aba 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -16,18 +16,36 @@ 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 ($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);
+
+//---------------------------------------------------------------------------------------------
+function trans_view($trans)
 {
-	$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);
+	return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
 }
+
+function edit_link($row) 
+{
+	global $page_nested;
+
+	return $page_nested || !$row['isopen'] ? '' :
+		trans_editor_link(ST_PURCHORDER, $row["order_no"]);
+}
+
+function prt_link($row)
+{
+	return print_document_link($row['order_no'], _("Print"), true, ST_PURCHORDER, ICON_PRINT);
+}
+
 if (isset($_GET['order_number']))
 {
-	$order_number = $_GET['order_number'];
+	$_POST['order_number'] = $_GET['order_number'];
 }
 
 //-----------------------------------------------------------------------------------
@@ -55,14 +73,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,51 +91,23 @@ 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);
+
+check_cells(_('Also closed:'), 'also_closed', check_value('also_closed'));
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table(1);
-//---------------------------------------------------------------------------------------------
-if (isset($_POST['order_number']))
-{
-	$order_number = $_POST['order_number'];
-}
-
-if (isset($_POST['SelectStockFromList']) &&	($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != ALL_TEXT))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
-
-//---------------------------------------------------------------------------------------------
-function trans_view($trans)
-{
-	return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
-}
-
-function edit_link($row) 
-{
-	if (@$_GET['popup'])
-		return '';
-  	return pager_link( _("Edit"),
-		"/purchasing/po_entry_items.php?" . SID 
-		. "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
-}
-
-function prt_link($row)
-{
-	return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
-}
 
 //---------------------------------------------------------------------------------------------
 
-$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'), get_post('also_closed'));
 
 $cols = array(
-		_("#") => array('fun'=>'trans_view', 'ord'=>''), 
+		_("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'), 
 		_("Reference"), 
 		_("Supplier") => array('ord'=>''),
 		_("Location"),
@@ -130,9 +119,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);
@@ -141,9 +131,5 @@ $table->width = "80%";
 
 display_db_pager($table);
 
-if (!@$_GET['popup'])
-{
-	end_form();
-	end_page();
-}	
-?>
+end_form();
+end_page();