X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=4046424e69f39b5b0a0d504bdd9a97092800f1dd;hb=c9287db64df3006874cddf56d35705707a466936;hp=6a40d9e775d2cdb7b97f04f70422ab977c3ee4a9;hpb=13367be8aaf5175295f7aab7160370458dad1824;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 6a40d9e7..4046424e 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -16,13 +16,42 @@ 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)
+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)
+{
+	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 receive_link($row) 
+{
+	global $page_nested;
+	
+	return $page_nested || !$row['OverDue'] ? '' :
+		pager_link( _("Receive"),
+			"/purchasing/po_receive_items.php?PONumber=" . $row["order_no"], ICON_RECEIVE);
+}
+
+function prt_link($row)
+{
+	return print_document_link($row['order_no'], _("Print"), true, ST_PURCHORDER, ICON_PRINT);
+}
+
 if (isset($_GET['order_number']))
 {
 	$_POST['order_number'] = $_GET['order_number'];
@@ -59,7 +88,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(_("into location:"), 'StockLocation', null, true);
@@ -71,43 +100,23 @@ 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);
 
+check_cells(_('Also closed:'), 'also_closed', check_value('also_closed'));
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table(1);
-//---------------------------------------------------------------------------------------------
-
-function trans_view($trans)
-{
-	return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
-}
-
-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);
-}
-
-function prt_link($row)
-{
-	return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
-}
 
 //---------------------------------------------------------------------------------------------
 
 $sql = get_sql_for_po_search_completed(get_post('OrdersAfterDate'), get_post('OrdersToDate'),
-	@$_GET['popup'] ? ALL_TEXT : get_post('supplier_id'),
-	get_post('StockLocation'), get_post('order_number'), get_post('SelectStockFromList'));
+	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"),
@@ -116,12 +125,14 @@ $cols = array(
 		_("Currency") => array('align'=>'center'), 
 		_("Order Total") => 'amount',
 		array('insert'=>true, 'fun'=>'edit_link'),
-		array('insert'=>true, 'fun'=>'prt_link'),
+		array('insert'=>true, 'fun'=>'receive_link'),
+		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);
@@ -132,4 +143,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>