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)