Unnecesary direct access to user setting superseded by calls to user_* functions.

[fa-stable.git] / sales / customer_credit_invoice.php

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 59e454efd163aa41095d743672bc49afc0fd0688..b64a57a07aa27d372748434b9a9dc54a948abae5 100644 (file)
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -26,11 +26,11 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
        $js .= get_js_open_window(900, 500);
 }
 
-if ($use_date_picker) {
+if (user_use_date_picker()) {
        $js .= get_js_date_picker();
 }
 
@@ -78,7 +78,7 @@ if (isset($_GET['AddedID'])) {
 
        display_footer_exit();
 } else
-       check_edit_conflicts();
+       check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ function can_process()
                set_focus('CreditDate');
                return false;
        } elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) {
-               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('CreditDate');
                return false;
        }
@@ -387,4 +387,3 @@ end_form();
 
 end_page();
 
-?>