X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=40a9ffd88ee1c2c161b365553260eec6b3e9afbb;hb=be38c92bf817200dd5d6f70153dde2826bae6238;hp=84fb2e12a9d3b2ca1d50ad6f8433dfc5b4e36792;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 84fb2e12..40a9ffd8 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -87,23 +87,32 @@ function due_date($row)
 
 function fmt_balance($row)
 {
-	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
-		? -$row["TotalAmount"] - $row["Allocated"]
-		: $row["TotalAmount"] - $row["Allocated"];
+	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)	? -$row["TotalAmount"] - $row["Allocated"]
+		: ($row["type"] == ST_JOURNAL ? abs($row["TotalAmount"]) - $row["Allocated"] :
+			$row["TotalAmount"] - $row["Allocated"]);
 	return $value;
 }
 
 function alloc_link($row)
 {
-	if (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
-		&& (-$row["TotalAmount"] - $row["Allocated"]) >= 0)
-			return 	pager_link(_("Allocations"), "/purchasing/allocations/supplier_allocate.php?trans_no=" .
-				$row["trans_no"]. "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
-	elseif ($row["type"] == ST_SUPPINVOICE && ($row["TotalAmount"] - $row["Allocated"]) > 0)
-			return 	pager_link(_("Pay"), "/purchasing/supplier_payment.php?supplier_id=".$row["supplier_id"]
-				."&PInvoice=".$row["trans_no"], ICON_MONEY );
-	else
-		return '';
+	$link = 
+	pager_link(_("Allocations"),
+		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
+			$row["trans_no"]. "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC );
+
+	if ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPAYMENT ||
+		(($row["type"] == ST_SUPPCREDIT || $row["type"] == ST_JOURNAL) && $row["TotalAmount"] < 0))
+		return floatcmp(-$row["TotalAmount"], $row["Allocated"]) ? $link : '';
+
+	$link = 
+	pager_link(_("Payment"),
+		"/purchasing/supplier_payment.php?supplier_id=".$row["supplier_id"]."&PInvoice=" 
+			. $row["trans_no"]."&trans_type=" . $row["type"], ICON_MONEY);
+
+	if ($row["type"] == ST_SUPPINVOICE || (($row["type"] == ST_SUPPCREDIT || $row["type"] == ST_JOURNAL) && $row["TotalAmount"] > 0))
+		return floatcmp($row["TotalAmount"], $row["Allocated"]) ? $link : '';
+
+
 }
 
 function fmt_debit($row)
@@ -125,12 +134,12 @@ $sql = get_sql_for_supplier_allocation_inquiry(get_post('TransAfterDate'),get_po
 
 $cols = array(
 	_("Type") => array('fun'=>'systype_name'),
-	_("#") => array('fun'=>'view_link', 'ord'=>''),
+	_("#") => array('fun'=>'view_link', 'ord'=>'', 'align'=>'right'),
 	_("Reference"), 
 	_("Supplier") => array('ord'=>''), 
 	_("Supp Reference"),
 	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
-	_("Due Date") => array('fun'=>'due_date'),
+	_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
 	_("Currency") => array('align'=>'center'),
 	_("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
 	_("Credit") => array('align'=>'right', 'insert'=>true, 'fun'=>'fmt_credit'),