X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fview_print_transaction.php;h=dbae9f3467628618b52118c4a2acbecc1a516042;hb=abd2759fcc8de3cd492933e4a253808956bc52f9;hp=1fcb30803edc207ecc7ba1a07289189f69105df9;hpb=01e3f893098a84726ba5316f68fa856c40c17bc7;p=fa-stable.git

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index 1fcb3080..dbae9f34 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 5;
 
@@ -19,6 +28,7 @@ page(_("View or Print Transactions"), false, false, "", $js);
 
 function viewing_controls()
 {
+	display_note(_("Only documents can be printed."));
     start_form(false, true);
 
     start_table("class='tablestyle_noborder'");
@@ -26,11 +36,16 @@ function viewing_controls()
 
 	systypes_list_cells(_("Type:"), 'filterType', null, true);
 
+	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"));
+    submit_cells('ProcessSearch', _("Search"), '', '', true);
 
 	end_row();
     end_table(1);
@@ -44,15 +59,17 @@ function check_valid_entries()
 {
 	if (!is_numeric($_POST['FromTransNo']) OR $_POST['FromTransNo'] <= 0)
 	{
-		display_note(_("The starting transaction number is expected to be numeric and greater than zero."));
+		display_error(_("The starting transaction number is expected to be numeric and greater than zero."));
 		return false;
 	}
 
 	if (!is_numeric($_POST['ToTransNo']) OR $_POST['ToTransNo'] <= 0)
 	{
-		echo _("The ending transaction number is expected to be numeric and greater than zero.");
+		display_error(_("The ending transaction number is expected to be numeric and greater than zero."));
 		return false;
 	}
+	if (!isset($_POST['filterType']) || $_POST['filterType'] == "")
+		return false;
 
 	return true;
 }
@@ -66,6 +83,9 @@ function handle_search()
 	{
 		$db_info = get_systype_db_info($_POST['filterType']);
 
+		if ($db_info == null)
+			return;
+
 		$table_name = $db_info[0];
 		$type_name = $db_info[1];
 		$trans_no_name = $db_info[2];
@@ -87,20 +107,33 @@ function handle_search()
 
 		$result = db_query($sql, "could not query transactions on $table_name");
 
-		if (db_num_rows($result) == 0) 
+		if (db_num_rows($result) == 0)
 		{
-			echo _("There are no transactions for the given parameters.");
+			display_notification(_("There are no transactions for the given parameters."));
 			return;
 		}
-
+		$print_type = $_POST['filterType'];
+		$print_out = ($print_type == 10 || $print_type == 11 || $print_type == systypes::cust_dispatch() ||
+			$print_type == systypes::po() || $print_type == systypes::sales_order());
+		if ($print_out)
+		{
+			if ($trans_ref)
+				$th = array(_("#"), _("Reference"), _("View"), _("Print"), _("GL"));
+			else
+				$th = array(_("#"), _("View"), _("Print"), _("GL"));
+		}
+		else
+		{
+			if ($trans_ref)
+				$th = array(_("#"), _("Reference"), _("View"), _("GL"));
+			else
+				$th = array(_("#"), _("View"), _("GL"));
+		}
+		div_start('transactions');
 		start_table($table_style);
-		if ($trans_ref)
-			$th = array(_("#"), _("Reference"), _("View"), _("Print"));
-		else	
-			$th = array(_("#"), _("View"), _("Print"));
-		table_header($th);	
+		table_header($th);
 		$k = 0;
-		while ($line = db_fetch($result)) 
+		while ($line = db_fetch($result))
 		{
 
 			alt_table_row_color($k);
@@ -108,32 +141,17 @@ function handle_search()
 			label_cell($line[$trans_no_name]);
 			if ($trans_ref)
 				label_cell($line[$trans_ref]);
-			label_cell(get_trans_view_str($_POST['filterType'],$line[$trans_no_name], _("View")));
-        	label_cell(get_gl_view_str_cell($_POST['filterType'], $line[$trans_no_name], _("View GL")));
+			label_cell(get_trans_view_str($_POST['filterType'],$line[$trans_no_name], _("View"), ICON_VIEW));
+			if ($print_out)
+				label_cell(print_document_link($line[$trans_no_name], _("Print"), true,	$print_type, ICON_PRINT));
+        	label_cell(get_gl_view_str($_POST['filterType'], $line[$trans_no_name]));
 
-        	$forms = get_form_entries($_POST['filterType'], $line[$trans_no_name]);
-        	while ($form_item = db_fetch($forms)) 
-        	{
-
-        		$param1 = $form_item['param1'];
-        		$param2 = $form_item['param2'];
-
-        		if ($_POST['filterType'] == systypes::bank_payment()
-        			|| $_POST['filterType'] == systypes::bank_deposit()
-        			|| $_POST['filterType'] == systypes::cust_payment()
-        			|| $_POST['filterType'] == systypes::supp_payment()) 
-        		{
-                		$param1 = payment_person_types::type_name($form_item['param1']);
-                		$param2 = payment_person_types::person_name($form_item['param1'], $form_item['param2'], false);
-        		}
-
-        		//label_cell(printTransaction(_("Print") . " " . getFormTypeName($form_item["form_type"]), $form_item['form_id'], $form_item['form_type'], $_POST['filterType'], $line[$trans_no_name], $line[$trans_ref], $param1, $param2));
-        	}
-        	end_row();
+	    	end_row();
 
 		}
 
 		end_table();
+		div_end();
 	}
 }
 
@@ -143,14 +161,13 @@ if (isset($_POST['ProcessSearch']))
 {
 	if (!check_valid_entries())
 		unset($_POST['ProcessSearch']);
+	$Ajax->activate('transactions');
 }
 
 //----------------------------------------------------------------------------------------
 
 viewing_controls();
 
-//echo getHiddenFieldScript();
-
 handle_search();
 
 br(2);