X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fview_print_transaction.php;h=90943fe75bb00647eba2504920cf33afe8ebfaab;hb=179e8cf33e77512ca94cf8389ea36a253feebba7;hp=dbae9f3467628618b52118c4a2acbecc1a516042;hpb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;p=fa-stable.git

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index dbae9f34..90943fe7 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -1,17 +1,18 @@
 <?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.
+	Released under the terms of the GNU General Public License, GPL, 
+	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>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$path_to_root="..";
-$page_security = 5;
+$page_security = 'SA_VIEWPRINTTRANSACTION';
+$path_to_root = "..";
 
+include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -25,11 +26,25 @@ if ($use_popup_windows)
 page(_("View or Print Transactions"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
+function view_link($trans)
+{
+	return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
+
+function prt_link($row)
+{
+  	if ($row['type'] != ST_CUSTPAYMENT && $row['type'] != ST_BANKDEPOSIT) // customer payment or bank deposit printout not defined yet.
+ 		return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT);
+}
+
+function gl_view($row)
+{
+	return get_gl_view_str($row["type"], $row["trans_no"]);
+}
 
 function viewing_controls()
 {
 	display_note(_("Only documents can be printed."));
-    start_form(false, true);
 
     start_table("class='tablestyle_noborder'");
 	start_row();
@@ -45,12 +60,11 @@ function viewing_controls()
 
     ref_cells(_("to #:"), 'ToTransNo');
 
-    submit_cells('ProcessSearch', _("Search"), '', '', true);
+    submit_cells('ProcessSearch', _("Search"), '', '', 'default');
 
 	end_row();
     end_table(1);
 
-	end_form();
 }
 
 //----------------------------------------------------------------------------------------
@@ -68,8 +82,6 @@ function check_valid_entries()
 		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;
 }
@@ -91,68 +103,44 @@ function handle_search()
 		$trans_no_name = $db_info[2];
 		$trans_ref = $db_info[3];
 
-		$sql = "SELECT DISTINCT $trans_no_name ";
+		$sql = "SELECT DISTINCT $trans_no_name as trans_no";
 
 		if ($trans_ref)
 			$sql .= " ,$trans_ref ";
 
-		$sql .= " FROM $table_name
+		$sql .= ", ".$_POST['filterType']." as type FROM $table_name
 			WHERE $trans_no_name >= " . $_POST['FromTransNo']. "
 			AND  $trans_no_name <= " . $_POST['ToTransNo'];
 
 		if ($type_name != null)
-			$sql .= " AND $type_name = " . $_POST['filterType'];
+			$sql .= " AND `$type_name` = " . $_POST['filterType'];
 
 		$sql .= " ORDER BY $trans_no_name";
 
-		$result = db_query($sql, "could not query transactions on $table_name");
 
-		if (db_num_rows($result) == 0)
-		{
-			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"));
+		$print_out = ($print_type == ST_SALESINVOICE || $print_type == ST_CUSTCREDIT || $print_type == ST_CUSTDELIVERY ||
+			$print_type == ST_PURCHORDER || $print_type == ST_SALESORDER || $print_type == ST_SALESQUOTE);
+
+		$cols = array(
+			_("#"), 
+			_("Reference"), 
+			_("View") => array('insert'=>true, 'fun'=>'view_link'),
+			_("Print") => array('insert'=>true, 'fun'=>'prt_link'), 
+			_("GL") => array('insert'=>true, 'fun'=>'gl_view')
+		);
+		if(!$print_out) {
+			array_remove($cols, 3);
 		}
-		else
-		{
-			if ($trans_ref)
-				$th = array(_("#"), _("Reference"), _("View"), _("GL"));
-			else
-				$th = array(_("#"), _("View"), _("GL"));
+		if(!$trans_ref) {
+			array_remove($cols, 1);
 		}
-		div_start('transactions');
-		start_table($table_style);
-		table_header($th);
-		$k = 0;
-		while ($line = db_fetch($result))
-		{
-
-			alt_table_row_color($k);
-
-			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"), 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]));
 
-	    	end_row();
-
-		}
-
-		end_table();
-		div_end();
+		$table =& new_db_pager('transactions', $sql, $cols);
+		$table->width = "40%";
+		display_db_pager($table);
 	}
+
 }
 
 //----------------------------------------------------------------------------------------
@@ -166,11 +154,10 @@ if (isset($_POST['ProcessSearch']))
 
 //----------------------------------------------------------------------------------------
 
-viewing_controls();
-
-handle_search();
-
-br(2);
+start_form(false);
+	viewing_controls();
+	handle_search();
+end_form(2);
 
 end_page();