X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=56d4312f5fb1c2fa0a40f4679ade924faf5d8770;hb=f0d25b5b9e8a2ec332a921fa85d5fb8be6fa73b3;hp=9c60415e7101e95afa2e4e49216eaeb2821e1012;hpb=95ff74b5722826544743a01daf527aa3c9efe11a;p=fa-stable.git

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index 9c60415e..56d4312f 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -70,9 +70,14 @@ function alloc_link($row)
 			.$row["trans_no"] . "&trans_type=" . $row["type"]. "&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
 }
 
+function amount_total($row)
+{
+	return price_format($row['type'] == ST_JOURNAL && $row["Total"] < 0 ? -$row["Total"] : $row["Total"]);
+}
+
 function amount_left($row)
 {
-	return price_format($row["Total"]-$row["alloc"]);
+	return price_format(($row['type'] == ST_JOURNAL && $row["Total"] < 0 ? -$row["Total"] : $row["Total"])-$row["alloc"]);
 }
 
 function check_settled($row)
@@ -85,12 +90,12 @@ $sql = get_allocatable_from_cust_sql($customer_id, $settled);
 
 $cols = array(
 	_("Transaction Type") => array('fun'=>'systype_name'),
-	_("#") => array('fun'=>'trans_view'),
+	_("#") => array('fun'=>'trans_view', 'align'=>'right'),
 	_("Reference"), 
 	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Customer") => array('ord'=>''),
 	_("Currency") => array('align'=>'center'),
-	_("Total") => 'amount', 
+	_("Total") => array('align'=>'right','fun'=>'amount_total'), 
 	_("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'), 
 	array('insert'=>true, 'fun'=>'alloc_link')
 	);