X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=6e4bcf88419e7a019b2463e98eb749c29a65c377;hb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;hp=1d339306e18f3f90cd3ce547f30700422c69f9d3;hpb=87e4961d8cb13efab395b6a5548164d6a748bf3d;p=fa-stable.git diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 1d339306..6e4bcf88 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -18,7 +18,7 @@ include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); page(_($help_context = "Supplier Allocation Inquiry"), false, false, "", $js); @@ -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); @@ -98,7 +98,7 @@ 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_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 );