X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fvoid_transaction.php;h=8d35c207c7ef50a2e7f4e116862f483de06f6d68;hb=06a878fac8f2aa889ee481a22bc9f68fef1f7c8b;hp=a2f0a435a4cd9b68d24a6ad776d150f20b5a48d7;hpb=7c0d108b47596677f513f73070a0c9746a2bd750;p=fa-stable.git

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index a2f0a435..8d35c207 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -70,8 +70,13 @@ function exist_transaction($type, $type_no)
 			break;
 
 		case ST_PURCHORDER : // it's a PO
-		case ST_SUPPRECEIVE : // it's a GRN
 			return false;
+
+		case ST_SUPPRECEIVE : // it's a GRN
+			if (exists_grn_on_invoices($type_no))
+				return false;
+			break;
+
 		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
@@ -116,6 +121,8 @@ function select_link($row)
 {
 	if (!isset($row['type']))
 		$row['type'] = $_POST['filterType'];
+	if (!is_date_in_fiscalyear($row['trans_date'], true))
+		return _("No");
   	return button('Edit'.$row["trans_no"], _("Select"), _("Select"), ICON_EDIT);
 }
 
@@ -140,8 +147,7 @@ function voiding_controls()
 {
 	global $selected_id;
 
-	$not_implemented =  array(ST_PURCHORDER, ST_SUPPRECEIVE, ST_SALESORDER, 
-		ST_SALESQUOTE, ST_COSTUPDATE);
+	$not_implemented =  array(ST_PURCHORDER, ST_SALESORDER, ST_SALESQUOTE, ST_COSTUPDATE);
 
 	start_form();