From: Joe <unknown>
Date: Sat, 5 Apr 2014 08:15:37 +0000 (+0200)
Subject: Selecting the cancel button in confirming the voiding of document did not work proper... 
X-Git-Tag: 2.3-final~145
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=1119d2e92eec8222ef07abac922dce1246ce9266;p=fa-stable.git

Selecting the cancel button in confirming the voiding of document did not work properly. Rerun
---

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index d893c544..f73a6d5f 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -729,22 +729,7 @@ if ($customer_error == "") {
 	display_delivery_details($_SESSION['Items']);
 	echo "</td></tr>";
 	end_table(1);
-/*
-	if ($_SESSION['Items']->trans_no == 0) {
-
-		submit_center_first('ProcessOrder', $porder,
-		    _('Check entered data and save document'), 'default');
-		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'));
-*/	   
 	if ($_SESSION['Items']->trans_no == 0) {
 
 		submit_center_first('ProcessOrder', $porder,