supplier_list_cells(_("Select a supplier: "), 'supplier_id', $_POST['supplier_id'], true);
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
date_cells(_("To:"), 'TransToDate', '', null, 1);
supp_allocations_list_cell("filterType", null);
function alloc_link($row)
{
- $link =
- pager_link(_("Allocations"),
- "/purchasing/allocations/supplier_allocate.php?trans_no=" .
- $row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
-
- return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
- && (-$row["TotalAmount"] - $row["Allocated"]) > 0)
- ? $link : '';
+ 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 '';
}
function fmt_debit($row)