From 092e038857ae167583472a58f54200dc73b18c1c Mon Sep 17 00:00:00 2001
From: Joe <unknown>
Date: Thu, 10 Jul 2014 10:43:31 +0200
Subject: [PATCH] Added supplier search in Outstanding Purchase Orders and
 Purchase Orders Inquiry.

---
 purchasing/includes/db/po_db.inc           | 10 +++++++---
 purchasing/inquiry/po_search.php           |  4 +++-
 purchasing/inquiry/po_search_completed.php |  5 ++++-
 sales/includes/db/cust_trans_db.inc        |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index ea541dcf..e182cd09 100644
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -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;;
 
@@ -292,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;;
 	
@@ -345,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";
diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index 220b1e1a..3cf0b6cd 100644
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -73,6 +73,8 @@ start_row();
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
+supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true);
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table(1);
@@ -121,7 +123,7 @@ else
 }
 
 //figure out the sql required from the inputs available
-$sql = get_sql_for_po_search();
+$sql = get_sql_for_po_search($_POST['supplier_id']);
 
 //$result = db_query($sql,"No orders were returned");
 
diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 9925ac63..03ab7b0e 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -74,6 +74,9 @@ start_row();
 
 stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
 
+if (!@$_GET['popup'])
+	supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true);
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 end_row();
 end_table(1);
@@ -115,7 +118,7 @@ function prt_link($row)
 
 //---------------------------------------------------------------------------------------------
 
-$sql = get_sql_for_po_search_completed();
+$sql = get_sql_for_po_search_completed(!@$_GET['popup'] ? $_POST['supplier_id'] : ALL_TEXT);
 
 $cols = array(
 		_("#") => array('fun'=>'trans_view', 'ord'=>''), 
diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 19cdaea7..d458e8c8 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -417,7 +417,7 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i
 			$sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation'])." ";
 		
 		if ($customer_id != ALL_TEXT)
-			$sql .= " AND sorder.debtor_no = ".db_escape($customer_id) . " AND trans.debtor_no = ".db_escape($customer_id);		
+			$sql .= " AND trans.debtor_no = ".db_escape($customer_id);		
 
 		$sql .= " GROUP BY trans.trans_no ";
 
-- 
2.30.2