New files from unstable branch

[fa-stable.git] / purchasing / inquiry / po_search_completed.php

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 1632f5b49de15f440d70011bdffddec4ba1231a1..ba77bf7a91222026e43ef12ea5b15f57192fb59e 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -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);
 
@@ -63,12 +63,17 @@ date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
 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);
 
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
-end_table();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 if (isset($_POST['order_number']))
 {
@@ -105,49 +110,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();
 
 $cols = array(
                _("#") => array('fun'=>'trans_view', 'ord'=>''),