Release 2.4.1

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

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 49232d81a8a3ca926f89ad1b3dcf1b2920a74a7a..73b99ca610bcd6925f1f5782a706a8e245643c51 100644 (file)
--- 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) && 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();
        }
 }
 
-?>
\ No newline at end of file