X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fvoid_transaction.php;h=e0d22ef71c7ed0fa8eb56e794e8efd3270853793;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=e93af71a44af859ccebc44ab03d051aa471a22fb;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index e93af71a..e0d22ef7 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -1,16 +1,16 @@
 <?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>.
 ***********************************************************************/
-$path_to_root="..";
-$page_security = 14;
+$page_security = 'SA_VOIDTRANSACTION';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -102,7 +102,7 @@ function voiding_controls()
 {
 	global $table_style2;
 	
-	start_form(false, true);
+	start_form();
 
 	start_table($table_style2);
 
@@ -117,7 +117,7 @@ function voiding_controls()
 	end_table(1);
 
     if (!isset($_POST['ProcessVoiding']))
-    	submit_center('ProcessVoiding', _("Void Transaction"), true, '', true);
+    	submit_center('ProcessVoiding', _("Void Transaction"), true, '', 'default');
     else 
     {
  		if (!exist_transaction($_POST['filterType'],$_POST['trans_no']))
@@ -126,11 +126,11 @@ function voiding_controls()
 			unset($_POST['trans_no']);
 			unset($_POST['memo_']);
 			unset($_POST['date_']);
-    		submit_center('ProcessVoiding', _("Void Transaction"), true, '', true);
+    		submit_center('ProcessVoiding', _("Void Transaction"), true, '', 'default');
 		}	
  		else
  		{
-    		display_notification_centered(_("Are you sure you want to void this transaction ? This action cannot be undone."), 0, 1);
+    		display_warning(_("Are you sure you want to void this transaction ? This action cannot be undone."), 0, 1);
     		if ($_POST['filterType'] == 0) // GL transaction are not included in get_trans_view_str
     			$view_str = get_gl_view_str($_POST['filterType'],$_POST['trans_no'], _("View Transaction"));
     		else
@@ -138,7 +138,7 @@ function voiding_controls()
     		display_note($view_str);
    			br();
     		submit_center_first('ConfirmVoiding', _("Proceed"), '', true);
-    		submit_center_last('CancelVoiding', _("Cancel"), '', true);
+    		submit_center_last('CancelVoiding', _("Cancel"), '', 'cancel');
     	}	
     }
 
@@ -149,6 +149,12 @@ function voiding_controls()
 
 function check_valid_entries()
 {
+	if (is_closed_trans($_POST['filterType'],$_POST['trans_no']))
+	{
+		display_error(_("The selected transaction was closed for edition and cannot be voided."));
+		set_focus('trans_no');
+		return;
+	}
 	if (!is_date($_POST['date_']))
 	{
 		display_error(_("The entered date is invalid."));
@@ -178,7 +184,6 @@ function handle_void_transaction()
 {
 	if (check_valid_entries()==true) 
 	{
-
 		$void_entry = get_voided_entry($_POST['filterType'], $_POST['trans_no']);
 		if ($void_entry != null) 
 		{