X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_ui.inc;fp=sales%2Fincludes%2Fsales_ui.inc;h=8c56d4d3fea02ffa1fba2fcd29d07608f8afc9f0;hb=abe7fb7c2dc7f845e5577bc40c7361150ac83c94;hp=49232d81a8a3ca926f89ad1b3dcf1b2920a74a7a;hpb=94ecb13dcd325f609be09f80806fac0739343c8d;p=fa-stable.git

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 49232d81..8c56d4d3 100644
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -44,9 +44,9 @@ function processing_active()
 */
 function check_edit_conflicts($cartname='Items')
 {
-	global $Ajax;
+	global $Ajax, $no_check_edit_conflicts;
 
-	if (get_post('cart_id') && $_POST['cart_id'] != $_SESSION[$cartname]->cart_id) {
+	if ((!isset($no_check_edit_conflicts) || $no_check_edit_conflicts==0) && get_post('cart_id') && $_POST['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();