X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=252e961154d203d08386a0b17d575e2eca3e0704;hb=f0f460043b9bcb6153c0f6f82d4a74433efe4ad8;hp=6d09615f50f850a07dcce5b608263cba999b9b5e;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 6d09615f..252e9611 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -65,13 +65,15 @@ function check_overdue($row)
 function order_link($row)
 {
 	return $row['order_']>0 ?
-		get_customer_trans_view_str(systypes::sales_order(), $row['order_'])
+		get_customer_trans_view_str(ST_SALESORDER, $row['order_'])
 		: "";
 }
 
 function systype_name($dummy, $type)
 {
-	return systypes::name($type);
+	global $systypes_array;
+
+	return $systypes_array[$type];
 }
 
 function view_link($trans)
@@ -96,18 +98,18 @@ function alloc_link($row)
 		"/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] 
 		."&trans_type=" . $row["type"], ICON_MONEY);
 
-	if ($row["type"] == 11 && $row['TotalAmount'] > 0)
+	if ($row["type"] == ST_CUSTCREDIT && $row['TotalAmount'] > 0)
 	{
 		/*its a credit note which could have an allocation */
 		return $link;
 	}
-	elseif (($row["type"] == systypes::cust_payment() || $row["type"] == systypes::bank_deposit()) &&
+	elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
 		($row['TotalAmount'] - $row['Allocated']) > 0)
 	{
 		/*its a receipt  which could have an allocation*/
 		return $link;
 	}
-	elseif ($row["type"] == systypes::cust_payment() && $row['TotalAmount'] < 0)
+	elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] < 0)
 	{
 		/*its a negative receipt */
 		return '';
@@ -117,7 +119,7 @@ function alloc_link($row)
 function fmt_debit($row)
 {
 	$value =
-	    $row['type']==11 || $row['type']==12 || $row['type']==2 ?
+	    $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
 		-$row["TotalAmount"] : $row["TotalAmount"];
 	return $value>=0 ? price_format($value) : '';
 
@@ -126,7 +128,7 @@ function fmt_debit($row)
 function fmt_credit($row)
 {
 	$value =
-	    !($row['type']==11 || $row['type']==12 || $row['type']==2) ?
+	    !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
 		-$row["TotalAmount"] : $row["TotalAmount"];
 	return $value>0 ? price_format($value) : '';
 }
@@ -147,7 +149,7 @@ function fmt_credit($row)
     	(trans.ov_amount + trans.ov_gst + trans.ov_freight 
 			+ trans.ov_freight_tax + trans.ov_discount)	AS TotalAmount,
 		trans.alloc AS Allocated,
-		((trans.type = 10)
+		((trans.type = ".ST_SALESINVOICE.")
 			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
     	FROM "
 			.TB_PREF."debtor_trans as trans, "
@@ -158,22 +160,22 @@ function fmt_credit($row)
     		AND trans.tran_date >= '$data_after'
     		AND trans.tran_date <= '$date_to'";
 
-   	if ($_POST['customer_id'] != reserved_words::get_all())
+   	if ($_POST['customer_id'] != ALL_TEXT)
    		$sql .= " AND trans.debtor_no = '" . $_POST['customer_id'] . "'";
 
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
+   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
    	{
    		if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
    		{
-   			$sql .= " AND trans.type = 10 ";
+   			$sql .= " AND trans.type = ".ST_SALESINVOICE." ";
    		}
    		elseif ($_POST['filterType'] == '3')
    		{
-			$sql .= " AND trans.type = " . systypes::cust_payment();
+			$sql .= " AND trans.type = " . ST_CUSTPAYMENT;
    		}
    		elseif ($_POST['filterType'] == '4')
    		{
-			$sql .= " AND trans.type = 11 ";
+			$sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
    		}
 
     	if ($_POST['filterType'] == '2')
@@ -186,7 +188,7 @@ function fmt_credit($row)
     	}
    	}else
    	{
-	    $sql .= " AND trans.type != 13 ";
+	    $sql .= " AND trans.type <> ".ST_CUSTDELIVERY." ";
    	}
 
 
@@ -214,7 +216,7 @@ $cols = array(
 	array('insert'=>true, 'fun'=>'alloc_link')
 	);
 
-if ($_POST['customer_id'] != reserved_words::get_all()) {
+if ($_POST['customer_id'] != ALL_TEXT) {
 	$cols[_("Customer")] = 'skip';
 	$cols[_("Currency")] = 'skip';
 }
@@ -222,10 +224,6 @@ if ($_POST['customer_id'] != reserved_words::get_all()) {
 $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 = "80%";
 start_form();