X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=e182cd09d9c75d4ac753ea12a20de3ff69570241;hb=d859c6081f650d22eba97b13a298b681148d0d6d;hp=adab9ad31f67b534283a7bb6f18303fe8c1262d0;hpb=0eb2322c049b8b386e9cc3337caa3f41151330bf;p=fa-stable.git

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index adab9ad3..e182cd09 100644
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -147,7 +147,7 @@ function read_po_header($order_no, &$order)
 		$order->credit = get_current_supp_credit($order->supplier_id);
 
       	$order->orig_order_date = sql2date($myrow["ord_date"]);
-      	$order->Comments = $myrow["comments"];
+      	$order->Comments = nl2br($myrow["comments"]);
       	$order->Location = $myrow["into_stock_location"];
       	$order->supp_ref = $myrow["requisition_no"];
       	$order->reference = $myrow["reference"];
@@ -247,7 +247,7 @@ function get_short_info($stock_id)
 	return db_query($sql,"The stock details for " . $stock_id . " could not be retrieved");
 }
 
-function get_sql_for_po_search_completed()
+function get_sql_for_po_search_completed($supplier_id=ALL_TEXT)
 {
 	global $order_number, $selected_stock_item;;
 
@@ -269,6 +269,8 @@ function get_sql_for_po_search_completed()
 		AND porder.supplier_id = supplier.supplier_id
 		AND location.loc_code = porder.into_stock_location ";
 
+	if (isset($_GET['supplier_id']))
+		$sql .= "AND supplier.supplier_id=".@$_GET['supplier_id']." ";
 	if (isset($order_number) && $order_number != "")
 	{
 		$sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');
@@ -290,14 +292,16 @@ function get_sql_for_po_search_completed()
 		{
 			$sql .= " AND line.item_code=".db_escape($selected_stock_item);
 		}
-
+		if ($supplier_id != ALL_TEXT)
+			$sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
+		
 	} //end not order number selected
 
 	$sql .= " GROUP BY porder.order_no";
 	return $sql;
 }	
 
-function get_sql_for_po_search()
+function get_sql_for_po_search($supplier_id=ALL_TEXT)
 {
 	global $all_items, $order_number, $selected_stock_item;;
 	
@@ -343,6 +347,8 @@ function get_sql_for_po_search()
 		{
 			$sql .= " AND line.item_code=".db_escape($selected_stock_item);
 		}
+		if ($supplier_id != ALL_TEXT)
+			$sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
 	} //end not order number selected
 
 	$sql .= " GROUP BY porder.order_no";