From 4dd850870279bb6846695c39194c3d4b0b5c1345 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 21 Feb 2008 15:41:35 +0000
Subject: [PATCH] Added Print for documents in
 /admin/view_print_transaction.php (according to our new routines)

---
 CHANGELOG.txt                    |  5 +++++
 admin/view_print_transaction.php | 28 ++++++++++++++++++++++------
 applications/setup.php           |  2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7a0d12df..8a0ec98f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Feb-2008 Joe Hunt
++ Added Print for documents in /admin/view_print_transaction.php (according to our new routines).
+$ /admin/view_print_transaction.php
+  /applications/setup.php
+  
 17-Feb-2008 Joe Hunt
 ! Minor change in menu and function in view_print_transaction.php
 $ /admin/view_print_transaction.php
diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index 0b3a2c88..70c5ca51 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -13,12 +13,13 @@ include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-page(_("View Transactions"), false, false, "", $js);
+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'");
@@ -102,12 +103,25 @@ function handle_search()
 			echo _("There are no transactions for the given parameters.");
 			return;
 		}
-
-		start_table($table_style);
-		if ($trans_ref)
-			$th = array(_("#"), _("Reference"), _("View"), _("GL"));
+		$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
-			$th = array(_("#"), _("View"), _("GL"));
+		{
+			if ($trans_ref)
+				$th = array(_("#"), _("Reference"), _("View"), _("GL"));
+			else
+				$th = array(_("#"), _("View"), _("GL"));
+		}
+		start_table($table_style);
 		table_header($th);
 		$k = 0;
 		while ($line = db_fetch($result))
@@ -119,6 +133,8 @@ function handle_search()
 			if ($trans_ref)
 				label_cell($line[$trans_ref]);
 			label_cell(get_trans_view_str($_POST['filterType'],$line[$trans_no_name], _("View")));
+			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")));
 
 	    	end_row();
diff --git a/applications/setup.php b/applications/setup.php
index df850c3d..1bc46c46 100644
--- a/applications/setup.php
+++ b/applications/setup.php
@@ -26,7 +26,7 @@
 
 			$this->add_module(_("Maintanance"));
 			$this->add_lapp_function(2, _("Void a Transaction"),"admin/void_transaction.php?");
-			$this->add_lapp_function(2, _("View Transactions"),"admin/view_print_transaction.php?");
+			$this->add_lapp_function(2, _("View or Print Transactions"),"admin/view_print_transaction.php?");
 			$this->add_rapp_function(2, _("Backup and Restore"),"admin/backups.php?", 15);
 			$this->add_rapp_function(2, _("Create/Update Companies"),"admin/create_coy.php?", 14);
 			$this->add_rapp_function(2, _("Install/Update Languages"),"admin/inst_lang.php?", 14);
-- 
2.30.2