X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppalloc_db.inc;h=959be3e2f2d6a1274737a739c27fb4a838df62a9;hb=1944920ea7a791d476e6f67d19f70f18985a52ee;hp=987a640db957073acbe105afc56b416e9f22740b;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index 987a640d..959be3e2 100644
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -170,11 +170,64 @@ function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $typ
 	{
 		$sql = get_alloc_supp_sql(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0
 			AND trans.type != ".ST_SUPPAYMENT."
-			AND trans.supplier_id=$supplier_id");
+			AND trans.supplier_id=".db_escape($supplier_id));
 	}
 
 	return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }
 
+function get_sql_for_supplier_allocation_inquiry()
+{
+ 	$date_after = date2sql($_POST['TransAfterDate']);
+ 	$date_to = date2sql($_POST['TransToDate']);
 
+    $sql = "SELECT 
+		trans.type, 
+		trans.trans_no,
+		trans.reference, 
+		supplier.supp_name, 
+		trans.supp_reference,
+    	trans.tran_date, 
+		trans.due_date,
+		supplier.curr_code, 
+    	(trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
+		trans.alloc AS Allocated,
+		((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+    	FROM "
+			.TB_PREF."supp_trans as trans, "
+			.TB_PREF."suppliers as supplier
+    	WHERE supplier.supplier_id = trans.supplier_id
+     	AND trans.tran_date >= '$date_after'
+    	AND trans.tran_date <= '$date_to'";
+
+   	if ($_POST['supplier_id'] != ALL_TEXT)
+   		$sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+   	{
+   		if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
+   		{
+   			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
+   		}
+   		elseif ($_POST['filterType'] == '3')
+   		{
+			$sql .= " AND trans.type = ".ST_SUPPAYMENT." ";
+   		}
+   		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
+   		{
+			$sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
+   		}
+
+   		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
+   		{
+   			$today =  date2sql(Today());
+			$sql .= " AND trans.due_date < '$today' ";
+   		}
+   	}
+
+   	if (!check_value('showSettled'))
+   	{
+   		$sql .= " AND (round(abs(ov_amount + ov_gst + ov_discount) - alloc,6) != 0) ";
+   	}
+   	return $sql;
+}
 ?>
\ No newline at end of file