X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=ca83d87465b21f5bc85740092e132b18a781d1fc;hb=bd8f517d30d1edd3261e26e582ddd9e11c555616;hp=aa2f269a06d5e136a3dfb7c8fcb46fc46c8589d9;hpb=f0f460043b9bcb6153c0f6f82d4a74433efe4ad8;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index aa2f269a..ca83d874 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -11,21 +11,22 @@
 ***********************************************************************/
 $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);
 
 if (isset($_GET['order_number']))
 {
-	$order_number = $_GET['order_number'];
+	$_POST['order_number'] = $_GET['order_number'];
 }
 
 //-----------------------------------------------------------------------------------
@@ -55,21 +56,28 @@ if (get_post('SearchOrders'))
 
 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);
+end_row();
+end_table();
+
+start_table(TABLESTYLE_NOBORDER);
+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);
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
-end_table();
-end_form();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 if (isset($_POST['order_number']))
 {
@@ -85,8 +93,8 @@ else
 {
 	unset($selected_stock_item);
 }
-
 //---------------------------------------------------------------------------------------------
+
 function trans_view($trans)
 {
 	return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
@@ -94,9 +102,10 @@ function trans_view($trans)
 
 function edit_link($row) 
 {
-  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, $trans["order_no"]);
 }
 
 function prt_link($row)
@@ -106,49 +115,8 @@ function prt_link($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 '%". $order_number . "%'";
-}
-else
-{
-
-	$data_after = date2sql($_POST['OrdersAfterDate']);
-	$date_before = date2sql($_POST['OrdersToDate']);
-
-	$sql .= " AND porder.ord_date >= '$data_after'";
-	$sql .= " AND porder.ord_date <= '$date_before'";
-
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
-	{
-		$sql .= " AND porder.into_stock_location = '". $_POST['StockLocation'] . "' ";
-	}
-	if (isset($selected_stock_item))
-	{
-		$sql .= " AND line.item_code='". $selected_stock_item ."' ";
-	}
-
-} //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'));
 
 $cols = array(
 		_("#") => array('fun'=>'trans_view', 'ord'=>''), 
@@ -171,10 +139,8 @@ if (get_post('StockLocation') != $all_items) {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);
 
 end_form();
 end_page();
-?>