X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=38703adf3e834dd3a9c26e05730734b278bce39e;hb=168c5beaa04a25f31face788f8030c5d08f8e998;hp=ebd2c7241e177f0dfe0f576bb7728a60e31520e6;hpb=f19ddeb227739e5b993ab5ba2310cfd0ace18c4f;p=fa-stable.git

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index ebd2c724..38703adf 100644
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -13,12 +13,18 @@
 
 function delete_po($po)
 {
+	global $Refs;
+
+	begin_transaction();
 	hook_db_prevoid($po, ST_PURCHORDER);
 	$sql = "DELETE FROM ".TB_PREF."purch_orders WHERE order_no=".db_escape($po);
 	db_query($sql, "The order header could not be deleted");
 
 	$sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE order_no =".db_escape($po);
 	db_query($sql, "The order detail lines could not be deleted");
+
+	$Refs->restore_last(ST_PURCHORDER, $po);
+	commit_transaction();
 }
 
 //----------------------------------------------------------------------------------------
@@ -98,14 +104,15 @@ function update_po(&$po_obj)
     foreach ($po_obj->line_items as $po_line)
     {
     	$sql = "INSERT INTO ".TB_PREF."purch_order_details (po_detail_item, order_no, item_code, 
-    		description, delivery_date, unit_price, quantity_ordered) VALUES ("
+    		description, delivery_date, unit_price, quantity_ordered, quantity_received) VALUES ("
 			.db_escape($po_line->po_detail_rec ? $po_line->po_detail_rec : 0). ","
 			.$po_obj->order_no . ","
 			.db_escape($po_line->stock_id). ","
 			.db_escape($po_line->item_description). ",'"
 			.date2sql($po_line->req_del_date) . "',"
 			.db_escape($po_line->price) . ", "
-			.db_escape($po_line->quantity) . ")";
+			.db_escape($po_line->quantity) . ", "
+			.db_escape($po_line->qty_received) . ")";
 		
 		db_query($sql, "One of the purchase order detail records could not be updated");
     }
@@ -146,7 +153,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"];
@@ -246,7 +253,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;;
 
@@ -268,6 +275,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 . '%');
@@ -289,14 +298,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;;
 	
@@ -342,6 +353,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";