X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_order_db.inc;h=ff61aaa5eef5b8c091a48ef38a43c2741131fa52;hb=7561718ee5113232ce917f63085d272884b0929c;hp=6ac1e9ddb02b04e658f56480cd8c725d79bc5e9f;hpb=13367be8aaf5175295f7aab7160370458dad1824;p=fa-stable.git

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 6ac1e9dd..ff61aaa5 100644
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -464,8 +464,8 @@ function get_branch_to_order($customer_id, $branch_id) {
 	OutstandingOnly
 	PrepaidOrders
 */
-function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_no, $filter, 
-	$stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT)
+function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter, 
+	$stock_item='', $from='', $to='', $ref='', $location=ALL_TEXT, $customer_id=ALL_TEXT)
 {
 
 	$sql = "SELECT 
@@ -489,7 +489,8 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n
 			prep_amount,
 			allocs.ord_payments,
 			inv.inv_payments,
-			sorder.total
+			sorder.total,
+			sorder.trans_type
 		FROM ".TB_PREF."sales_orders as sorder
 		LEFT JOIN (SELECT trans_no_to, sum(amt) ord_payments FROM ".TB_PREF."cust_allocations WHERE trans_type_to=".ST_SALESORDER." GROUP BY trans_no_to)
 			 allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no
@@ -515,8 +516,7 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n
 	elseif ($ref != "")
 	{
 		// search orders with reference like 
-		$number_like = "%".$ref."%";
-		$sql .= " AND sorder.reference LIKE ".db_escape($number_like);
+		$sql .= " AND sorder.reference LIKE ".db_escape('%' . $ref . '%');
 //				." GROUP BY sorder.order_no";
 	}
 	else	// ... or select inquiry constraints
@@ -533,13 +533,13 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n
 		if ($trans_type == ST_SALESQUOTE && !check_value('show_all'))
 			$sql .= " AND sorder.delivery_date >= '".date2sql(Today())."' AND line.qty_sent=0"; // show only outstanding, not realized quotes
 
-		if ($selected_customer != -1)
-			$sql .= " AND sorder.debtor_no=".db_escape($selected_customer);
+		//if ($selected_customer != -1)
+		//	$sql .= " AND sorder.debtor_no=".db_escape($selected_customer);
 
-		if (isset($stock_item))
+		if ($stock_item != ALL_TEXT)
 			$sql .= " AND line.stk_code=".db_escape($stock_item);
 
-		if ($location)
+		if ($location != ALL_TEXT)
 			$sql .= " AND sorder.from_stk_loc = ".db_escape($location);
 
 		if ($filter=='OutstandingOnly')