X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=e3aa9567082a2e45dea005cd09e260808ee3a04f;hb=1cb4f8ee15c1b2971594821b48d9ef034f5edb13;hp=968600bb15e47832818228caa0b60d368d6b49d4;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 968600bb..e3aa9567 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -41,7 +41,7 @@ start_row();
 
 customer_list_cells(_("Select a customer: "), 'customer_id', $_POST['customer_id'], true);
 
-date_cells(_("from:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+date_cells(_("from:"), 'TransAfterDate', '', null, -user_transaction_days());
 date_cells(_("to:"), 'TransToDate', '', null, 1);
 
 cust_allocations_list_cells(_("Type:"), 'filterType', null);
@@ -82,7 +82,7 @@ function view_link($trans)
 
 function due_date($row)
 {
-	return $row["type"] == 10 ? $row["due_date"] : '';
+	return $row["type"] == ST_SALESINVOICE ? $row["due_date"] : '';
 }
 
 function fmt_balance($row)
@@ -101,8 +101,10 @@ function alloc_link($row)
 	{
 		/*its a credit note which could have an allocation */
 		return $link;
-	}
-	elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
+	} elseif ($row["type"] == ST_JOURNAL && $row['TotalAmount'] < 0)
+	{
+		return $link;
+	} elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
 		(floatcmp($row['TotalAmount'], $row['Allocated']) >= 0))
 	{
 		/*its a receipt  which could have an allocation*/
@@ -112,7 +114,7 @@ function alloc_link($row)
 	{
 		/*its a negative receipt */
 		return '';
-	} elseif ($row["type"] == ST_SALESINVOICE && ($row['TotalAmount'] - $row['Allocated']) > 0)
+	} elseif (($row["type"] == ST_SALESINVOICE && ($row['TotalAmount'] - $row['Allocated']) > 0) || $row["type"] == ST_BANKPAYMENT)
 		return pager_link(_("Payment"),
 			"/sales/customer_payments.php?customer_id=".$row["debtor_no"]."&SInvoice=" . $row["trans_no"], ICON_MONEY);