Merged changes form stabel branch up to the current state (2.3.22+).

[fa-stable.git] / sales / includes / db / cust_trans_db.inc

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 36697ced6f553f4a549b8860089aad5470df2184..b63ff123c5fb5ddbe1e9cf2e21caddda97c6b250 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -365,7 +365,7 @@ function get_sql_for_customer_inquiry()
        return $sql;
 }
 
-function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null)
+function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null, $customer_id=ALL_TEXT)
 {
        $sql = "SELECT trans.trans_no,
                        debtor.name,
@@ -419,6 +419,9 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i
 
                if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
                        $sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation'])." ";
+               
+               if ($customer_id != ALL_TEXT)
+                       $sql .= " AND trans.debtor_no = ".db_escape($customer_id);              
 
                $sql .= " GROUP BY trans.trans_no ";