Better wrapping on comments in documents.

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

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 7e7f7afd195aeffd4e0b5e0729443a00295cfe0d..5873c3eb755f8b2dba6621d58f4a17381944ebf0 100644 (file)
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -19,12 +19,14 @@ include_once($path_to_root . "/includes/banking.inc");
 //
 function processing_start()
 {
+       page_processing(false);
     processing_end();
     $_SESSION['Processing'] = $_SERVER['PHP_SELF'];
 }
 
 function processing_end()
 {
+       page_processing(true);
     unset($_SESSION['Processing']);
     if ( isset($_SESSION['Items']) ) {
                unset($_SESSION['Items']->line_items);
@@ -40,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;
-       
-       if (isset($_POST['cart_id']) && $_POST['cart_id'] != $_SESSION[$cartname]->cart_id) {
+       global $Ajax, $SysPrefs;
+
+       if ((!isset($SysPrefs->no_check_edit_conflicts) || $SysPrefs->no_check_edit_conflicts==0) && $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