X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fview_print_transaction.php;h=106d161a98eef6cf0a95be437f18c46d693b0828;hb=236c7f536aac0064585c371d37cf527f6984f3ce;hp=a8c09d2d6b0f7d13edaf70b459a333e9b9d5dd3e;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index a8c09d2d..106d161a 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -5,18 +5,21 @@ $page_security = 5;
 
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("View or Print Transactions"));
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/reporting/includes/reporting.inc");
+$js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(800, 500);
+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'");
@@ -24,6 +27,11 @@ 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');
@@ -51,6 +59,8 @@ function check_valid_entries()
 		echo _("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;
 }
@@ -64,6 +74,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];
@@ -85,20 +98,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.");
 			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)
+		{
+			print_hidden_script($print_type);
+			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"));
+		}
 		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);
@@ -107,27 +133,11 @@ function handle_search()
 			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")));
+			if ($print_out)
+				label_cell(print_document_link($line[$trans_no_name], _("Print"), true,	$print_type));
+        	label_cell(get_gl_view_str($_POST['filterType'], $line[$trans_no_name], _("View GL")));
 
-        	$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();
 
 		}
 
@@ -147,8 +157,6 @@ if (isset($_POST['ProcessSearch']))
 
 viewing_controls();
 
-//echo getHiddenFieldScript();
-
 handle_search();
 
 br(2);