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

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 49232d81..9b762621 100644
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -42,15 +42,14 @@ function processing_active()
 	Check if the cart was not destroyed during opening the edition page in
 	another browser tab.
 */
-function check_edit_conflicts($cartname='Items')
+function check_edit_conflicts($cart_id, $cartname='Items')
 {
-	global $Ajax;
+	global $Ajax, $SysPrefs;
 
-	if (get_post('cart_id') && $_POST['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();
 	}
 }
 
-?>
\ No newline at end of file