Additional fixes to app options reorganization.

[fa-stable.git] / admin / void_transaction.php

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 841ff08e4e0eb48c95c841c5756e196aad2d7a46..7e3019ab5000902a81bbeb0e0e1a46e0f4d846a3 100644 (file)
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/admin/db/transactions_db.inc");
 
 include_once($path_to_root . "/admin/db/voiding_db.inc");
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
@@ -121,6 +121,8 @@ function select_link($row)
 {
        if (!isset($row['type']))
                $row['type'] = $_POST['filterType'];
+       if (!is_date_in_fiscalyear($row['trans_date'], true))
+               return _("N/A");
        return button('Edit'.$row["trans_no"], _("Select"), _("Select"), ICON_EDIT);
 }
 
@@ -152,7 +154,7 @@ function voiding_controls()
     start_table(TABLESTYLE_NOBORDER);
        start_row();
 
-       systypes_list_cells(_("Type:"), 'filterType', null, true, $not_implemented);
+       systypes_list_cells(_("Transaction Type:"), 'filterType', null, true, $not_implemented);
        if (list_updated('filterType'))
                $selected_id = -1;
 
@@ -166,7 +168,7 @@ function voiding_controls()
     ref_cells(_("to #:"), 'ToTransNo');
 
     submit_cells('ProcessSearch', _("Search"), '', '', 'default');
-               
+
        end_row();
     end_table(1);