X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fview_print_transaction.php;h=65bc42d4a69aaa57f150efcd297847d9c1b2cb26;hb=02dd4aefa3e3babb64d61140bb7f7de14e37f755;hp=8e07831474eb3f9b9cc79638039840800877867f;hpb=335234b4bfa5e4fb58e35da36322b8d0cdfe7f89;p=fa-stable.git

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index 8e078314..65bc42d4 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -1,16 +1,16 @@
 <?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");
@@ -18,12 +18,13 @@ include_once($path_to_root . "/includes/session.inc");
 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 . "/admin/db/transactions_db.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);
+page(_($help_context = "View or Print Transactions"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
 function view_link($trans)
@@ -33,7 +34,7 @@ function view_link($trans)
 
 function prt_link($row)
 {
-  	if ($row['type'] != 12 && $row['type'] != 2) // customer payment or bank deposit printout not defined yet.
+  	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);
 }
 
@@ -60,7 +61,7 @@ function viewing_controls()
 
     ref_cells(_("to #:"), 'ToTransNo');
 
-    submit_cells('ProcessSearch', _("Search"), '', '', true);
+    submit_cells('ProcessSearch', _("Search"), '', '', 'default');
 
 	end_row();
     end_table(1);
@@ -82,8 +83,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;
 }
@@ -95,34 +94,14 @@ function handle_search()
 	global $table_style;
 	if (check_valid_entries()==true)
 	{
-		$db_info = get_systype_db_info($_POST['filterType']);
-
-		if ($db_info == null)
+		$trans_ref = false;
+		$sql = get_sql_for_view_transactions($_POST['filterType'], $_POST['FromTransNo'], $_POST['ToTransNo'], $trans_ref);
+		if ($sql == "")
 			return;
 
-		$table_name = $db_info[0];
-		$type_name = $db_info[1];
-		$trans_no_name = $db_info[2];
-		$trans_ref = $db_info[3];
-
-		$sql = "SELECT DISTINCT $trans_no_name as trans_no";
-
-		if ($trans_ref)
-			$sql .= " ,$trans_ref ";
-
-		$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 .= " ORDER BY $trans_no_name";
-
-
 		$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());
+		$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(
 			_("#"), 
@@ -139,10 +118,6 @@ function handle_search()
 		}
 
 		$table =& new_db_pager('transactions', $sql, $cols);
-		if (list_updated('filterType')) {
-			$table->set_sql($sql);
-			$table->set_columns($cols);
-		}
 		$table->width = "40%";
 		display_db_pager($table);
 	}
@@ -160,7 +135,7 @@ if (isset($_POST['ProcessSearch']))
 
 //----------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form(false);
 	viewing_controls();
 	handle_search();
 end_form(2);