X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=5630f04d20facd74821acb5918f19a9266f9c6ff;hb=25379bdc9f10bda4aae4b37f04d16eb1bbe7e4f6;hp=6d01aebcace45ea05be0abd3799b5c83f712b67c;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 6d01aebc..5630f04d 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -82,12 +82,12 @@ 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)
 {
-	return $row["TotalAmount"] - $row["Allocated"];
+	return ($row["type"] == ST_JOURNAL && $row["TotalAmount"] < 0 ? -$row["TotalAmount"] : $row["TotalAmount"]) - $row["Allocated"];
 }
 
 function alloc_link($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);
 
@@ -142,9 +144,9 @@ $sql = get_sql_for_customer_allocation_inquiry(get_post('TransAfterDate'), get_p
 //------------------------------------------------------------------------------------------------
 $cols = array(
 	_("Type") => array('fun'=>'systype_name'),
-	_("#") => array('fun'=>'view_link'),
+	_("#") => array('fun'=>'view_link', 'align'=>'right'),
 	_("Reference"), 
-	_("Order") => array('fun'=>'order_link', 'ord'=>''), 
+	_("Order") => array('fun'=>'order_link', 'ord'=>'', 'align'=>'right'), 
 	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
 	_("Customer") => array('name' =>'name',  'ord'=>'asc'),