X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search.php;h=54cb22ef17a5b3b07cab16b4a8264a7349f886e9;hb=ddaf32837daa7ffa05298b63ac237b38eef3778a;hp=e8f9f0c6318abb12c5529181cd6eb9c5e5a67b9c;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index e8f9f0c6..54cb22ef 100644
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -22,7 +22,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Search Outstanding Purchase Orders"), false, false, "", $js);
+page(_($help_context = "Search Outstanding Purchase Orders"), false, false, "", $js);
 
 if (isset($_GET['order_number']))
 {
@@ -57,7 +57,7 @@ if (get_post('SearchOrders'))
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'order_number', '',null, '', true);
 
@@ -71,7 +71,6 @@ stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table();
-end_form();
 //---------------------------------------------------------------------------------------------
 function trans_view($trans)
 {
@@ -117,53 +116,9 @@ else
 }
 
 //figure out the sql required from the inputs available
-$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,
-	Sum(line.delivery_date < '". date2sql(Today()) ."'
-	AND (line.quantity_ordered > line.quantity_received)) As OverDue
-	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
-	AND (line.quantity_ordered > line.quantity_received) ";
-
-if (isset($order_number) && $order_number != "")
-{
-	$sql .= "AND porder.reference LIKE '%". $order_number . "%'";
-}
-else
-{
-	$data_after = date2sql($_POST['OrdersAfterDate']);
-	$data_before = date2sql($_POST['OrdersToDate']);
-
-	$sql .= "  AND porder.ord_date >= '$data_after'";
-	$sql .= "  AND porder.ord_date <= '$data_before'";
+$sql = get_sql_for_po_search();
 
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
-	{
-		$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";
-
-$result = db_query($sql,"No orders were returned");
+//$result = db_query($sql,"No orders were returned");
 
 /*show a table of the orders returned by the sql */
 $cols = array(
@@ -187,12 +142,7 @@ if (get_post('StockLocation') != $all_items) {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked orders have overdue items."));
 
-if (get_post('SearchOrders')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);