Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / inventory / adjustments.php

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 33c24b62d3d74424f8507674a7b7bf484db35ed8..7ed4b6050b404c3da86a45ee03797c44dc1a442b 100644 (file)
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/item_adjustments_ui.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Item Adjustments Note"), false, false, "", $js);
 
@@ -111,7 +111,7 @@ function can_process()
        } 
        elseif (!is_date_in_fiscalyear($_POST['AdjDate'])) 
        {
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('AdjDate');
                return false;
        }
@@ -237,4 +237,3 @@ submit_center_last('Process', _("Process Adjustment"), '', 'default');
 end_form();
 end_page();
 
-?>