X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fpo_search_completed.php;h=3100db293e68b130efea94a18e6d8de45047a3a2;hb=827b3428d4c8c473cb637ac9df6621f4a0ba6f9a;hp=7e2f7f61a652086816a4448665881540b1789f96;hpb=de320b43ef41373a90d9061483b6e8970947fdfa;p=fa-stable.git

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 7e2f7f61..3100db29 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -2,6 +2,7 @@
 
 $page_security = 2;
 $path_to_root="../..";
+include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
@@ -63,7 +64,6 @@ end_table();
 end_form();
 
 //---------------------------------------------------------------------------------------------
-
 if (isset($_POST['order_number']))
 {
 	$order_number = $_POST['order_number'];
@@ -79,20 +79,40 @@ else
 	unset($selected_stock_item);
 }
 
+//---------------------------------------------------------------------------------------------
+function trans_view($trans)
+{
+	return get_trans_view_str(systypes::po(), $trans["order_no"]);
+}
+
+function prt_link($row)
+{
+	return print_document_link($row['order_no'], _("Print"), true, 18);
+}
+
 //---------------------------------------------------------------------------------------------
 
-//figure out the sql required from the inputs available
-$sql = "SELECT ".TB_PREF."purch_orders.order_no, ".TB_PREF."suppliers.supp_name, ".TB_PREF."purch_orders.ord_date, ".TB_PREF."purch_orders.into_stock_location,
-	".TB_PREF."purch_orders.requisition_no, ".TB_PREF."purch_orders.reference, ".TB_PREF."locations.location_name,
-	".TB_PREF."suppliers.curr_code, Sum(".TB_PREF."purch_order_details.unit_price*".TB_PREF."purch_order_details.quantity_ordered) AS OrderValue
-	FROM ".TB_PREF."purch_orders, ".TB_PREF."purch_order_details, ".TB_PREF."suppliers, ".TB_PREF."locations
-	WHERE ".TB_PREF."purch_orders.order_no = ".TB_PREF."purch_order_details.order_no
-	AND ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
-	AND ".TB_PREF."locations.loc_code = ".TB_PREF."purch_orders.into_stock_location ";
+$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 ".TB_PREF."purch_orders.reference LIKE '%". $order_number . "%'";
+	$sql .= "AND porder.reference LIKE '%". $order_number . "%'";
 }
 else
 {
@@ -100,70 +120,49 @@ else
 	$data_after = date2sql($_POST['OrdersAfterDate']);
 	$date_before = date2sql($_POST['OrdersToDate']);
 
-	$sql .= " AND ".TB_PREF."purch_orders.ord_date >= '$data_after'";
-	$sql .= " AND ".TB_PREF."purch_orders.ord_date <= '$date_before'";
+	$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 ".TB_PREF."purch_orders.into_stock_location = '". $_POST['StockLocation'] . "' ";
+		$sql .= " AND porder.into_stock_location = '". $_POST['StockLocation'] . "' ";
 	}
 	if (isset($selected_stock_item))
 	{
-		$sql .= " AND ".TB_PREF."purch_order_details.item_code='". $selected_stock_item ."' ";
+		$sql .= " AND line.item_code='". $selected_stock_item ."' ";
 	}
 
 } //end not order number selected
 
-$sql .= " GROUP BY ".TB_PREF."purch_orders.order_no";
-
-$result = db_query($sql,"No orders were returned");
-
-print_hidden_script(18);
-
-div_start('orders_tbl');
-start_table("$table_style colspan=7 width=80%");
-
-if (isset($_POST['StockLocation']) && $_POST['StockLocation'] == reserved_words::get_all())
-	$th = array(_("#"), _("Reference"), _("Supplier"), _("Location"),
-		_("Supplier's Reference"), _("Order Date"), _("Currency"), _("Order Total"),"");
-else
-	$th = array(_("#"), _("Reference"), _("Supplier"),
-		_("Supplier's Reference"), _("Order Date"), _("Currency"), _("Order Total"),"");
-
-table_header($th);
-
-$j = 1;
-$k = 0; //row colour counter
-while ($myrow = db_fetch($result))
-{
-
-	alt_table_row_color($k);
-
-	$date = sql2date($myrow["ord_date"]);
-
-	label_cell(get_trans_view_str(systypes::po(), $myrow["order_no"]));
-	label_cell($myrow["reference"]);
-	label_cell($myrow["supp_name"]);
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] == reserved_words::get_all())
-		label_cell($myrow["location_name"]);
-	label_cell($myrow["requisition_no"]);
-	label_cell($date);
-	label_cell($myrow["curr_code"]);
-	amount_cell($myrow["OrderValue"]);
-  	label_cell(print_document_link($myrow['order_no'], _("Print")));
-	end_row();
-
-	$j++;
-	if ($j == 12)
-	{
-		$j = 1;
-		table_header($th);
-	}
+$sql .= " GROUP BY porder.order_no";
+
+$cols = array(
+		_("#") => array('fun'=>'trans_view', 'ord'=>''), 
+		_("Reference"), 
+		_("Supplier") => array('ord'=>''),
+		_("Location"),
+		_("Supplier's Reference"), 
+		_("Order Date") => array('type'=>'date', 'ord'=>'desc'),
+		_("Currency") => array('align'=>'center'), 
+		_("Order Total") => 'amount',
+		array('insert'=>true, 'fun'=>'prt_link'),
+);
+
+if (get_post('StockLocation') != $all_items) {
+	$cols[_("Location")] = 'skip';
 }
-
-end_table(2);
-div_end();
 //---------------------------------------------------------------------------------------------------
 
+$table =& new_db_pager('orders_tbl', $sql, $cols);
+
+if (get_post('SearchOrders')) 
+{
+	$table->set_sql($sql);
+	$table->set_columns($cols);
+	$Ajax->activate('orders_tbl');
+} 
+	start_form();
+	display_db_pager($table);
+	end_form();
 end_page();
 ?>