X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search.php;h=2cd7223a59635e7bdc654441127a9f83544a469f;hb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;hp=41a7c4c4aed21522fa3bb09769e81842bd1dab4f;hpb=1bb2f13025c8472861d331315f6d33b2241de046;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index 41a7c4c4..2cd7223a 100644
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 2;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
@@ -13,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']))
 {
@@ -46,48 +55,48 @@ 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, -$_SESSION["wa_current_user"]->prefs->transaction_days());
 date_cells(_("to:"), 'OrdersToDate');
 
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
-
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
 end_row();
 end_table();
 
-end_form();
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
+stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
+
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
+end_row();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 function trans_view($trans)
 {
-	return get_trans_view_str(systypes::po(), $trans["order_no"]);
+	return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
 }
 
 function edit_link($row) 
 {
   return pager_link( _("Edit"),
-	"/purchasing/po_entry_items.php?" . SID 
-	. "ModifyOrderNumber=" . $row["order_no"]);
+	"/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
 }
 
 function prt_link($row)
 {
-	return print_document_link($row['order_no'], _("Print"), true, 18);
+	return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
 }
 
 function receive_link($row) 
 {
   return pager_link( _("Receive"),
-	"/purchasing/po_receive_items.php?" . SID 
-	. "PONumber=" . $row["order_no"]);
+	"/purchasing/po_receive_items.php?PONumber=" . $row["order_no"], ICON_RECEIVE);
 }
 
 function check_overdue($row)
@@ -112,53 +121,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'";
-
-	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";
+$sql = get_sql_for_po_search();
 
-$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(
@@ -167,7 +132,7 @@ $cols = array(
 		_("Supplier") => array('ord'=>''),
 		_("Location"),
 		_("Supplier's Reference"), 
-		_("Order Date") => array('type'=>'date', 'ord'=>'desc'),
+		_("Order Date") => array('name'=>'ord_date', 'type'=>'date', 'ord'=>'desc'),
 		_("Currency") => array('align'=>'center'), 
 		_("Order Total") => 'amount',
 		array('insert'=>true, 'fun'=>'edit_link'),
@@ -182,15 +147,10 @@ if (get_post('StockLocation') != $all_items) {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked orders have overdue items."));
 
+$table->width = "80%";
 
-if (get_post('SearchOrders')) 
-{
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-	$Ajax->activate('orders_tbl');
-} 
-	start_form();
-	display_db_pager($table);
-	end_form();
+display_db_pager($table);
+
+end_form();
 end_page();
 ?>