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

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index c71c0cde..8c939aba 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -9,23 +9,43 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_SUPPTRANSVIEW';
 $path_to_root="../..";
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/session.inc");
 
-include($path_to_root . "/purchasing/includes/purchasing_ui.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 ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
-page(_("Search Purchase Orders"), false, false, "", $js);
+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 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'];
 }
 
 //-----------------------------------------------------------------------------------
@@ -53,105 +73,41 @@ if (get_post('SearchOrders'))
 }
 //---------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
-start_table("class='tablestyle_noborder'");
+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);
-
-stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
-
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
 end_row();
 end_table();
-end_form();
-//---------------------------------------------------------------------------------------------
-if (isset($_POST['order_number']))
-{
-	$order_number = $_POST['order_number'];
-}
-
-if (isset($_POST['SelectStockFromList']) &&	($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != reserved_words::get_all()))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
-
-//---------------------------------------------------------------------------------------------
-function trans_view($trans)
-{
-	return get_trans_view_str(systypes::po(), $trans["order_no"]);
-}
-
-function edit_link($row) 
-{
-  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);
-}
 
-//---------------------------------------------------------------------------------------------
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
-$sql = "SELECT 
-	porder.order_no, 
-	porder.reference, 
-	supplier.supp_name, 
-	location.location_name,
-	porder.requisition_no, 
-	porder.ord_date, 
-	supplier.curr_code, 
-	Sum(line.unit_price*line.quantity_ordered) AS OrderValue,
-	porder.into_stock_location
-	FROM ".TB_PREF."purch_orders as porder, "
-		.TB_PREF."purch_order_details as line, "
-		.TB_PREF."suppliers as supplier, "
-		.TB_PREF."locations as location
-	WHERE porder.order_no = line.order_no
-	AND porder.supplier_id = supplier.supplier_id
-	AND location.loc_code = porder.into_stock_location ";
-
-if (isset($order_number) && $order_number != "")
-{
-	$sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');
-}
-else
-{
+stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
 
-	$data_after = date2sql($_POST['OrdersAfterDate']);
-	$date_before = date2sql($_POST['OrdersToDate']);
+if (!$page_nested)
+	supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true);
 
-	$sql .= " AND porder.ord_date >= '$data_after'";
-	$sql .= " AND porder.ord_date <= '$date_before'";
+check_cells(_('Also closed:'), 'also_closed', check_value('also_closed'));
 
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
-	{
-		$sql .= " AND porder.into_stock_location = ".db_escape($_POST['StockLocation']);
-	}
-	if (isset($selected_stock_item))
-	{
-		$sql .= " AND line.item_code=".db_escape($selected_stock_item);
-	}
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
+end_row();
+end_table(1);
 
-} //end not order number selected
+//---------------------------------------------------------------------------------------------
 
-$sql .= " GROUP BY porder.order_no";
+$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"),
@@ -163,22 +119,17 @@ $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);
 
-if (get_post('SearchOrders')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);
 
 end_form();
 end_page();
-?>