X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_ui.inc;h=9b7626218bbba6ac8d8c94ecfaa1732ab8679b5a;hb=317210096efdbe5b375d5a0112d4f10a3c3c0b53;hp=1c1ebbf978f81ae3403c812502c3ec7206dd535a;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 1c1ebbf9..9b762621 100644
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/date_functions.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 && 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