X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=38508f71ea5fec9141509a9f51b11084d99e1d6b;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=c3bdbcb6ddab9dc980c5c99b204de6bb32026a67;hpb=8430384235d77fb7f8d8ca894e5efedd04d6bc0b;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c3bdbcb6..38508f71 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.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>.
 ***********************************************************************/
-$page_security=2;
-$path_to_root="../..";
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
@@ -35,7 +35,7 @@ if (isset($_GET['ToDate'])){
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier();
@@ -50,7 +50,7 @@ date_cells(_("To:"), 'TransToDate');
 
 supp_allocations_list_cell("filterType", null);
 
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 
 end_row();
 end_table();
@@ -89,7 +89,7 @@ function display_supplier_summary($supplier_record)
 //------------------------------------------------------------------------------------------------
 
 div_start('totals_tbl');
-if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::get_all()))
+if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
 {
 	$supplier_record = get_supplier_details($_POST['supplier_id']);
     display_supplier_summary($supplier_record);
@@ -104,7 +104,8 @@ if(get_post('RefreshInquiry'))
 //------------------------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
-	return systypes::name($type);
+	global $systypes_array;
+	return $systypes_array[$type];
 }
 
 function trans_view($trans)
@@ -114,8 +115,7 @@ function trans_view($trans)
 
 function due_date($row)
 {
-	return ($row["type"]== 20) || ($row["type"]== 21)
-		 ? $row["due_date"] : '';
+	return ($row["type"]== 20) || ($row["type"]== 21) ? $row["due_date"] : '';
 }
 
 function gl_view($row)
@@ -176,10 +176,11 @@ function check_overdue($row)
     	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'";
-   	if ($_POST['supplier_id'] != reserved_words::get_all())
+    	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'] != reserved_words::get_all())
+   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
    	{
    		if (($_POST['filterType'] == '1')) 
    		{
@@ -220,7 +221,7 @@ $cols = array(
 			array('insert'=>true, 'fun'=>'credit_link')
 			);
 
-if ($_POST['supplier_id'] != reserved_words::get_all())
+if ($_POST['supplier_id'] != ALL_TEXT)
 {
 	$cols[_("Supplier")] = 'skip';
 	$cols[_("Currency")] = 'skip';