X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=89383141a161f41b3561143d6e6d8e0fa2a4a697;hb=c99c4da3f3a009e48b536dc1cc5268d566dfc6cb;hp=b0d9d51b1d71b8c258149276af5969dd4942bc3e;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index b0d9d51b..89383141 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -82,13 +82,13 @@ function view_link($trans)
 
 function due_date($row)
 {
-	return (($row["type"] == 20) || ($row["type"]== 21))
+	return (($row["type"] == ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT))
 		? $row["due_date"] : "";
 }
 
 function fmt_balance($row)
 {
-	$value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22)
+	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
 		? -$row["TotalAmount"] - $row["Allocated"]
 		: $row["TotalAmount"] - $row["Allocated"];
 	return $value;
@@ -101,7 +101,7 @@ function alloc_link($row)
 		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
 			$row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
 
-	return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) 
+	return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
 		&& (-$row["TotalAmount"] - $row["Allocated"]) > 0)
 		? $link : '';
 }
@@ -135,7 +135,7 @@ function fmt_credit($row)
 		supplier.curr_code, 
     	(trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
 		trans.alloc AS Allocated,
-		((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+		((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
@@ -148,15 +148,15 @@ function fmt_credit($row)
    	{
    		if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
    		{
-   			$sql .= " AND trans.type = 20 ";
+   			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
    		}
    		elseif ($_POST['filterType'] == '3')
    		{
-			$sql .= " AND trans.type = 22 ";
+			$sql .= " AND trans.type = ".ST_SUPPAYMENT." ";
    		}
    		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
    		{
-			$sql .= " AND trans.type = 21 ";
+			$sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
    		}
 
    		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
@@ -196,10 +196,6 @@ if ($_POST['supplier_id'] != ALL_TEXT) {
 $table =& new_db_pager('doc_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-if (get_post('RefreshInquiry')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "90%";
 start_form();