Merged latest changes from stable branch.

[fa-stable.git] / purchasing / inquiry / supplier_allocation_inquiry.php

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 17bf983bf87247d39273b2a18d651e14f5bcf202..fc19aee869944fd81786071865674ae743cd0317 100644 (file)
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -47,7 +47,7 @@ start_row();
 
 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);
@@ -96,9 +96,9 @@ function fmt_balance($row)
 function alloc_link($row)
 {
        if (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
-               && (-$row["TotalAmount"] - $row["Allocated"]) > 0)
+               && (-$row["TotalAmount"] - $row["Allocated"]) >= 0)
                        return  pager_link(_("Allocations"), "/purchasing/allocations/supplier_allocate.php?trans_no=" .
-                               $row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
+                               $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 );