X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=31c774263c967f2a834a326f8fa21cbe02699bbc;hb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;hp=23053bae4cc850e4dbeedea3b564d7fdbeba1461;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 23053bae..31c77426 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -11,17 +11,17 @@
 ***********************************************************************/
 $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)
 	$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']))
 {
@@ -55,21 +55,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, -$_SESSION["wa_current_user"]->prefs->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 (!@$_GET['popup'])
+	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']))
 {
@@ -94,9 +101,13 @@ 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;
+
+	if ($page_nested)
+		return '';
+  	return pager_link( _("Edit"),
+		"/purchasing/po_entry_items.php?" . SID 
+		. "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
 }
 
 function prt_link($row)
@@ -106,49 +117,7 @@ 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 ".db_escape('%'. $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 = ".db_escape($_POST['StockLocation']);
-	}
-	if (isset($selected_stock_item))
-	{
-		$sql .= " AND line.item_code=".db_escape($selected_stock_item);
-	}
-
-} //end not order number selected
-
-$sql .= " GROUP BY porder.order_no";
+$sql = get_sql_for_po_search_completed(!@$_GET['popup'] ? $_POST['supplier_id'] : ALL_TEXT);
 
 $cols = array(
 		_("#") => array('fun'=>'trans_view', 'ord'=>''), 
@@ -171,7 +140,6 @@ if (get_post('StockLocation') != $all_items) {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);