X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fvoid_transaction.php;h=110516072153c1e09b54562f54c022a5177dd508;hb=211598c5964fd138631395c7f329ec8b87c43c0b;hp=6e84a17ca48ee5625c4a68f452d8729817f46dca;hpb=76ca9fef9bb510236a6a7740fa0f60eb7db384c9;p=fa-stable.git

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 6e84a17c..11051607 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/admin/db/transactions_db.inc");
 
 include_once($path_to_root . "/admin/db/voiding_db.inc");
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 	
 page(_($help_context = "Void a Transaction"), false, false, "", $js);
@@ -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 _("N/A");
   	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();
 
@@ -167,7 +173,7 @@ function voiding_controls()
     end_table(1);
     
 	$trans_ref = false;
-	$sql = get_sql_for_view_transactions($_POST['filterType'], $_POST['FromTransNo'], $_POST['ToTransNo'], $trans_ref);
+	$sql = get_sql_for_view_transactions(get_post('filterType'), get_post('FromTransNo'), get_post('ToTransNo'), $trans_ref);
 	if ($sql == "")
 		return;
 
@@ -329,4 +335,3 @@ voiding_controls();
 
 end_page();
 
-?>
\ No newline at end of file