X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fvoid_transaction.php;h=d3639d16a161c043045df174f1549b1f1481ddb0;hb=2e1d3d3452b30a4185436789c8bb8890c8313226;hp=6066d3ed338a570cf5761cddc0a98035814ead3e;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 6066d3ed..d3639d16 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 "";
   	return button('Edit'.$row["trans_no"], _("Select"), _("Select"), ICON_EDIT);
 }
 
@@ -139,20 +146,34 @@ function ref_view($row)
 function voiding_controls()
 {
 	global $selected_id;
+
+	$not_implemented =  array(ST_PURCHORDER, ST_SALESORDER, ST_SALESQUOTE, ST_COSTUPDATE);
+
 	start_form();
 
     start_table(TABLESTYLE_NOBORDER);
 	start_row();
 
-	systypes_list_cells(_("Transaction Type:"), 'filterType', null, true);
+	systypes_list_cells(_("Type:"), 'filterType', null, true, $not_implemented);
 	if (list_updated('filterType'))
 		$selected_id = -1;
+
+	if (!isset($_POST['FromTransNo']))
+        $_POST['FromTransNo'] = "1";
+    if (!isset($_POST['ToTransNo']))
+        $_POST['ToTransNo'] = "999999";
+
+    ref_cells(_("from #:"), 'FromTransNo');
+
+    ref_cells(_("to #:"), 'ToTransNo');
+
+    submit_cells('ProcessSearch', _("Search"), '', '', 'default');
 		
 	end_row();
     end_table(1);
     
 	$trans_ref = false;
-	$sql = get_sql_for_view_transactions($_POST['filterType'], null, null, $trans_ref);
+	$sql = get_sql_for_view_transactions($_POST['filterType'], $_POST['FromTransNo'], $_POST['ToTransNo'], $trans_ref);
 	if ($sql == "")
 		return;