X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fvoid_transaction.php;h=55c6a9f0e3bc51c4f46e432e9da43492fff7575b;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=1be108f87f3f3b71b4295aa65e72f6676c34142f;hpb=4d4371fb200bb27fd6b680ebd2d1aaa450a0be7e;p=fa-stable.git

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 1be108f8..55c6a9f0 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     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");
@@ -36,61 +36,65 @@ function exist_transaction($type, $type_no)
 
 	switch ($type) 
 	{
-		case 0 : // it's a journal entry
+		case ST_JOURNAL : // it's a journal entry
 			if (!exists_gl_trans($type, $type_no))
 				return false;
 			break;
 
-		case 1 : // it's a payment
-		case 2 : // it's a deposit
-		case 4 : // it's a transfer
+		case ST_BANKPAYMENT : // it's a payment
+		case ST_BANKDEPOSIT : // it's a deposit
+		case ST_BANKTRANSFER : // it's a transfer
 			if (!exists_bank_trans($type, $type_no))
 				return false;
 			break;
 
-		case 10 : // it's a customer invoice
-		case 11 : // it's a customer credit note
-		case 12 : // it's a customer payment
-		case 13 : // it's a customer dispatch
+		case ST_SALESINVOICE : // it's a customer invoice
+		case ST_CUSTCREDIT : // it's a customer credit note
+		case ST_CUSTPAYMENT : // it's a customer payment
+		case ST_CUSTDELIVERY : // it's a customer dispatch
 			if (!exists_customer_trans($type, $type_no))
 				return false;
 			break;
 
-		case systypes::location_transfer() : // it's a stock transfer
+		case ST_LOCTRANSFER : // it's a stock transfer
 			if (get_stock_transfer_items($type_no) == null)
 				return false;
 			break;
 
-		case systypes::inventory_adjustment() : // it's a stock adjustment
+		case ST_INVADJUST : // it's a stock adjustment
 			if (get_stock_adjustment_items($type_no) == null)
 				return false;
 			break;
 
-		case 25 : // it's a GRN
+		case ST_PURCHORDER : // it's a PO
+		case ST_SUPPRECEIVE : // it's a GRN
 			return false;
-		case 20 : // it's a suppler invoice
-		case 21 : // it's a supplier credit note
-		case 22 : // it's a supplier payment
+		case ST_SUPPINVOICE : // it's a suppler invoice
+		case ST_SUPPCREDIT : // it's a supplier credit note
+		case ST_SUPPAYMENT : // it's a supplier payment
 			if (!exists_supp_trans($type, $type_no))
 				return false;
 			break;
 
-		case systypes::work_order() : // it's a work order
+		case ST_WORKORDER : // it's a work order
 			if (!get_work_order($type_no, true))
 				return false;
 			break;
 
-		case 28 : // it's a work order issue
+		case ST_MANUISSUE : // it's a work order issue
 			if (!exists_work_order_issue($type_no))
 				return false;
 			break;
 
-		case 29 : // it's a work order production
+		case ST_MANURECEIVE : // it's a work order production
 			if (!exists_work_order_produce($type_no))
 				return false;
 			break;
 
-		case systypes::cost_update() : // it's a stock cost update
+		case ST_SALESORDER: // it's a sales order
+		case ST_SALESQUOTE: // it's a sales quotation
+			return false;
+		case ST_COSTUPDATE : // it's a stock cost update
 			return false;
 			break;
 	}
@@ -131,7 +135,7 @@ function voiding_controls()
  		else
  		{
     		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
+    		if ($_POST['filterType'] == ST_JOURNAL) // GL transaction are not included in get_trans_view_str
     			$view_str = get_gl_view_str($_POST['filterType'],$_POST['trans_no'], _("View Transaction"));
     		else
     			$view_str = get_trans_view_str($_POST['filterType'],$_POST['trans_no'], _("View Transaction"));
@@ -149,6 +153,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 +188,6 @@ function handle_void_transaction()
 {
 	if (check_valid_entries()==true) 
 	{
-
 		$void_entry = get_voided_entry($_POST['filterType'], $_POST['trans_no']);
 		if ($void_entry != null) 
 		{