Merged changes from main trunk up to 2.2.5

[fa-stable.git] / purchasing / inquiry / supplier_inquiry.php

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index dff07c662cbf465f6b7485ecc355d5fbca486f2c..ea5c8384cfb8624a7e5fe1d58ad3d93538a0f203 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -15,13 +15,14 @@ include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Supplier Inquiry"), false, false, "", $js);
+page(_($help_context = "Supplier Inquiry"), false, false, "", $js);
 
 if (isset($_GET['supplier_id'])){
        $_POST['supplier_id'] = $_GET['supplier_id'];
@@ -54,7 +55,6 @@ submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 
 end_row();
 end_table();
-end_form();
 set_global_supplier($_POST['supplier_id']);
 
 //------------------------------------------------------------------------------------------------
@@ -147,7 +147,8 @@ function fmt_credit($row)
 
 function prt_link($row)
 {
-               return print_document_link($row['trans_no'], _("Print"), true, $row['type']);
+       if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT || $row['type'] == ST_SUPPCREDIT) 
+               return print_document_link($row['trans_no']."-".$row['type'], _("Print Remittance"), true, ST_SUPPAYMENT, ICON_PRINT);
 }
 
 function check_overdue($row)
@@ -157,54 +158,7 @@ function check_overdue($row)
 }
 //------------------------------------------------------------------------------------------------
 
-    $date_after = date2sql($_POST['TransAfterDate']);
-    $date_to = date2sql($_POST['TransToDate']);
-
-    // Sherifoz 22.06.03 Also get the description
-    $sql = "SELECT trans.type, 
-               trans.trans_no,
-               trans.reference, 
-               supplier.supp_name, 
-               trans.supp_reference,
-       trans.tran_date, 
-               trans.due_date,
-               supplier.curr_code, 
-       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
-               trans.alloc AS Allocated,
-               ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
-       (ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount - trans.alloc) <= 0.005) AS Settled
-       FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier
-       WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.tran_date >= '$date_after'
-       AND trans.tran_date <= '$date_to'
-               AND trans.ov_amount != 0";      // exclude voided transactions
-       if ($_POST['supplier_id'] != ALL_TEXT)
-               $sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
-       if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-       {
-               if (($_POST['filterType'] == '1')) 
-               {
-                       $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
-               } 
-               elseif (($_POST['filterType'] == '2')) 
-               {
-                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
-               } 
-               elseif ($_POST['filterType'] == '3') 
-               {
-                       $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
-               } 
-               elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) 
-               {
-                       $sql .= " AND trans.type = ".ST_SUPPCREDIT."  ";
-               }
-
-               if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) 
-               {
-                       $today =  date2sql(Today());
-                       $sql .= " AND trans.due_date < '$today' ";
-               }
-       }
+$sql = get_sql_for_supplier_inquiry();
 
 $cols = array(
                        _("Type") => array('fun'=>'systype_name', 'ord'=>''), 
@@ -218,7 +172,8 @@ $cols = array(
                        _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
                        _("Credit") => array('align'=>'right', 'insert'=>true,'fun'=>'fmt_credit'), 
                        array('insert'=>true, 'fun'=>'gl_view'),
-                       array('insert'=>true, 'fun'=>'credit_link')
+                       array('insert'=>true, 'fun'=>'credit_link'),
+                       array('insert'=>true, 'fun'=>'prt_link')
                        );
 
 if ($_POST['supplier_id'] != ALL_TEXT)
@@ -233,12 +188,7 @@ if ($_POST['supplier_id'] != ALL_TEXT)
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-if (get_post('RefreshInquiry')) {
-       $table->set_sql($sql);
-       $table->set_columns($cols);
-}
 $table->width = "85%";
-start_form();
 
 display_db_pager($table);