X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocation_main.php;fp=sales%2Fallocations%2Fcustomer_allocation_main.php;h=56d4312f5fb1c2fa0a40f4679ade924faf5d8770;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=5059735f6a9d8019d9992d488468e1e5d94e3273;hpb=9549235b87720c573a2f1e2144d5a1bb55e6e8fc;p=fa-stable.git

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index 5059735f..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)
@@ -90,7 +95,7 @@ $cols = array(
 	_("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')
 	);