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

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index a9ca0c56..c612639f 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -9,7 +9,7 @@
     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");
@@ -21,7 +21,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($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,7 +55,7 @@ if (get_post('SearchOrders'))
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'order_number', '',null, '', true);
 
@@ -66,10 +66,9 @@ locations_list_cells(_("into location:"), 'StockLocation', null, true);
 
 stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table();
-end_form();
 //---------------------------------------------------------------------------------------------
 if (isset($_POST['order_number']))
 {
@@ -77,7 +76,7 @@ if (isset($_POST['order_number']))
 }
 
 if (isset($_POST['SelectStockFromList']) &&	($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != reserved_words::get_all()))
+	($_POST['SelectStockFromList'] != ALL_TEXT))
 {
  	$selected_stock_item = $_POST['SelectStockFromList'];
 }
@@ -89,59 +88,24 @@ else
 //---------------------------------------------------------------------------------------------
 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 prt_link($row)
+function edit_link($row) 
 {
-	return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
+  return pager_link( _("Edit"),
+	"/purchasing/po_entry_items.php?" . SID 
+	. "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
 }
 
-//---------------------------------------------------------------------------------------------
-
-$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 != "")
+function prt_link($row)
 {
-	$sql .= "AND porder.reference LIKE '%". $order_number . "%'";
+	return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
 }
-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'] != reserved_words::get_all())
-	{
-		$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();
 
 $cols = array(
 		_("#") => array('fun'=>'trans_view', 'ord'=>''), 
@@ -152,6 +116,7 @@ $cols = array(
 		_("Order Date") => array('name'=>'ord_date', 'type'=>'date', 'ord'=>'desc'),
 		_("Currency") => array('align'=>'center'), 
 		_("Order Total") => 'amount',
+		array('insert'=>true, 'fun'=>'edit_link'),
 		array('insert'=>true, 'fun'=>'prt_link'),
 );
 
@@ -162,12 +127,7 @@ if (get_post('StockLocation') != $all_items) {
 
 $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);