Access to system settings moved from global scope to SysPrefs.

[fa-stable.git] / sales / includes / sales_ui.inc

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 378f336127fc3fe22d417cc954b1587abb785e90..73b99ca610bcd6925f1f5782a706a8e245643c51 100644 (file)
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -44,9 +44,9 @@ function processing_active()
 */
 function check_edit_conflicts($cart_id, $cartname='Items')
 {
-       global $Ajax, $no_check_edit_conflicts;
+       global $Ajax, $SysPrefs;
 
-       if ((!isset($no_check_edit_conflicts) || $no_check_edit_conflicts==0) && get_post('cart_id') && $cart_id != $_SESSION[$cartname]->cart_id) {
+       if ((!isset($SysPrefs->no_check_edit_conflicts) || $SysPrefs->no_check_edit_conflicts==0) && get_post('cart_id') && $cart_id != $_SESSION[$cartname]->cart_id) {
                display_error(_('This edit session has been abandoned by opening sales document in another browser tab. You cannot edit more than one sales document at once.'));
                $Ajax->activate('_page_body');
                display_footer_exit();