X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_ui.inc;h=9b7626218bbba6ac8d8c94ecfaa1732ab8679b5a;hb=24fb0a10f96e0ffba9b877c662ae2bf9dc79256b;hp=378f336127fc3fe22d417cc954b1587abb785e90;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 378f3361..9b762621 100644
--- 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) && $cart_id && isset($_SESSION[$cartname]) && $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();