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

[fa-stable.git] / purchasing / includes / db / po_db.inc

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 22a853d140ef49afaa13cfa9778540f4687be111..a097db4617c4bb4b63817b7fa34bc9cdda8b31a2 100644 (file)
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -258,7 +258,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;;
 
@@ -303,14 +303,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;;
        
@@ -356,6 +358,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";