X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=5630f04d20facd74821acb5918f19a9266f9c6ff;hb=6351305b2b0e5782804ab4d9e3db5f84b671d6f2;hp=ab75d23767f914807f353a57303c75d92ae72469;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index ab75d237..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)
@@ -144,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'),