Rerun. Stuff forgotten.

[fa-stable.git] / admin / view_print_transaction.php

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index aca82ee8df6fe60ed8d731f4198fcff865384412..65bc42d4a69aaa57f150efcd297847d9c1b2cb26 100644 (file)
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -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);
 }
 
@@ -93,33 +94,13 @@ 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 == ST_CUSTDELIVERY ||
+               $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(
@@ -137,10 +118,6 @@ function handle_search()
                }
 
                $table =& new_db_pager('transactions', $sql, $cols);
-               if (list_updated('filterType') || get_post('ProcessSearch')) {
-                       $table->set_sql($sql);
-                       $table->set_columns($cols);
-               }
                $table->width = "40%";
                display_db_pager($table);
        }