X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=eb6a3a1f16ebf3a85319a63034ec22afd6592e6d;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=8a7464d79fc4f1a65b0bf4826d7820ad06dccdd3;hpb=6a4d8e6c1e92ff1b8fc5abb3fae76fb1c1968550;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 8a7464d7..eb6a3a1f 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -164,10 +164,10 @@ function post_void_supp_trans($type, $type_no)
 
 //----------------------------------------------------------------------------------------
 
-function get_sql_for_supplier_inquiry()
+function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_id=ALL_TEXT)
 {
-    $date_after = date2sql($_POST['TransAfterDate']);
-    $date_to = date2sql($_POST['TransToDate']);
+    $date_after = date2sql($after_date);
+    $date_to = date2sql($to_date);
 
     $sql = "SELECT trans.type, 
 		trans.trans_no,
@@ -204,38 +204,38 @@ function get_sql_for_supplier_inquiry()
      	AND trans.delivery_date >= '$date_after'
     	AND trans.delivery_date <= '$date_to'";
 
-   	if ($_POST['supplier_id'] != ALL_TEXT) {
-   		$sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
-   		$sql2 .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+   	if ($supplier_id != ALL_TEXT) {
+   		$sql .= " AND trans.supplier_id = ".db_escape($supplier_id);
+   		$sql2 .= " AND trans.supplier_id = ".db_escape($supplier_id);
 	}
-	if (($_POST['filterType'] == '6')) 
+	if (($filter == '6')) 
 	{
 			$sql = $sql2;
 	} 
-	elseif (!isset($_POST['filterType']) || $_POST['filterType'] == ALL_TEXT || $_POST['filterType'] == '6') {
+	elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
 		$sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
    	}
 
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+   	if (isset($filter) && $filter != ALL_TEXT)
    	{
-   		if (($_POST['filterType'] == '1')) 
+   		if (($filter == '1')) 
    		{
    			$sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
    		} 
-   		elseif (($_POST['filterType'] == '2')) 
+   		elseif (($filter == '2')) 
    		{
    			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
    		} 
-   		elseif ($_POST['filterType'] == '3') 
+   		elseif ($filter == '3') 
    		{
 			$sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
    		} 
-   		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) 
+   		elseif (($filter == '4') || ($filter == '5')) 
    		{
 			$sql .= " AND trans.type = ".ST_SUPPCREDIT."  ";
    		}
 
-   		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) 
+   		if (($filter == '2') || ($filter == '5')) 
    		{
    			$today =  date2sql(Today());
 			$sql .= " AND trans.due_date < '$today' ";