X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=f73a6d5fd8f5d5feb4ccee9db55fbd93a8b41ace;hb=f6f02cc789c66c6807fb612ae02a6908f46e60f9;hp=9b7e46b4dc57adf2eaff3d70aa0f635390119800;hpb=be99f1e63f8e27c2c5db75f93cd9956eb2239a03;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 9b7e46b4..f73a6d5f 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -595,7 +595,8 @@ function  handle_cancel_order()
 		submenu_option(_("Enter a New Sales Invoice"),	"/sales/sales_order_entry.php?NewInvoice=1");
 	} elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
 	{
-		delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
+		if ($_SESSION['Items']->trans_no != 0) 
+			delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
 		display_notification(_("This sales quotation has been cancelled as requested."), 1);
 		submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes");
 	} else { // sales order
@@ -733,16 +734,20 @@ if ($customer_error == "") {
 
 		submit_center_first('ProcessOrder', $porder,
 		    _('Check entered data and save document'), 'default');
+		submit_center_last('CancelOrder', $cancelorder,
+	   		_('Cancels document entry or removes sales order when editing an old document'), true);
 		submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
 	} else {
-		if ($_SESSION['Items']->trans_type==ST_SALESORDER)
-			submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?'));
 		submit_center_first('ProcessOrder', $corder,
 		    _('Validate changes and update document'), 'default');
+		submit_center_last('CancelOrder', $cancelorder,
+	   		_('Cancels document entry or removes sales order when editing an old document'), true);
+		if ($_SESSION['Items']->trans_type==ST_SALESORDER)
+			submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?'));
+		else
+			submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
 	}
 
-	submit_center_last('CancelOrder', $cancelorder,
-	   _('Cancels document entry or removes sales order when editing an old document'));
 } else {
 	display_error($customer_error);
 }