X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fvoid_transaction.php;h=110516072153c1e09b54562f54c022a5177dd508;hb=927ebef2443b6dda544056e33ec84b71d2bdb6c2;hp=d91c53d0923c470b619dc9f66813f9ed56fdfb73;hpb=df3ebb4251529abb480179600417fe7164951fe2;p=fa-stable.git

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index d91c53d0..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);
 }
 
@@ -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(_("Transaction 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(get_post('filterType'), get_post('FromTransNo'), get_post('ToTransNo'), $trans_ref);
 	if ($sql == "")
 		return;
 
@@ -163,9 +184,6 @@ function voiding_controls()
 		_("GL") => array('insert'=>true, 'fun'=>'gl_view'),
 		_("Select") => array('insert'=>true, 'fun'=>'select_link') 
 	);
-	if(!$trans_ref) {
-		array_remove($cols, 1);
-	}
 
 	$table =& new_db_pager('transactions', $sql, $cols);
 	$table->width = "40%";
@@ -173,17 +191,17 @@ function voiding_controls()
 
 	start_table(TABLESTYLE2);
 
-	//systypes_list_row(_("Transaction Type:"), "filterType", null, true);
-	
 	if ($selected_id != -1)
 	{
-		$_POST['trans_no'] = $selected_id;
+		hidden('trans_no', $selected_id);
 		hidden('selected_id', $selected_id);
 	}
 	else
-		$_POST['trans_no'] = '';
-		
-    text_row(_("Transaction #:"), 'trans_no', null, 12, 12);
+	{
+		hidden('trans_no', '');
+		$_POST['memo_'] = '';
+	}	
+    label_row(_("Transaction #:"), ($selected_id==-1?'':$selected_id));
 
     date_row(_("Voiding Date:"), 'date_');
 
@@ -317,4 +335,3 @@ voiding_controls();
 
 end_page();
 
-?>
\ No newline at end of file