X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=817fbfc5e063fb056734d420f8fd13ee16942f5e;hb=7e8c90ee7e898a9181f62f387ccb92158f47f59c;hp=e2f237db9b1a3506ea133292053529771e4fed4e;hpb=e000d0b3fb245b02de604356b1f60c65b5f4962f;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index e2f237db..817fbfc5 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	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/gpl-3.0.html>.
+***********************************************************************/
 $page_security=2;
 $path_to_root="../..";
 include($path_to_root . "/includes/db_pager.inc");
@@ -26,7 +35,7 @@ if (isset($_GET['ToDate'])){
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier();
@@ -41,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();
@@ -105,8 +114,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)
@@ -114,6 +122,15 @@ function gl_view($row)
 	return get_gl_view_str($row["type"], $row["trans_no"]);
 }
 
+function credit_link($row)
+{
+	return $row['type'] == 20 && $row["TotalAmount"] - $row["Allocated"] > 0 ?
+		pager_link(_("Credit This"),
+			"/purchasing/supplier_credit.php?New=1&invoice_no=".
+			$row['trans_no'], ICON_CREDIT)
+			: '';
+}
+
 function fmt_debit($row)
 {
 	$value = $row["TotalAmount"];
@@ -158,7 +175,8 @@ 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'";
+    	AND trans.tran_date <= '$date_to'
+		AND trans.ov_amount != 0";	// exclude voided transactions
    	if ($_POST['supplier_id'] != reserved_words::get_all())
    		$sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
    	if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
@@ -193,12 +211,13 @@ $cols = array(
 			_("Reference"), 
 			_("Supplier"),
 			_("Supplier's Reference"), 
-			_("Date") => array('type'=>'date', 'ord'=>'desc'), 
+			_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'), 
 			_("Due Date") => array('type'=>'date', 'fun'=>'due_date'), 
 			_("Currency") => array('align'=>'center'),
 			_("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')
 			);
 
 if ($_POST['supplier_id'] != reserved_words::get_all())
@@ -217,6 +236,7 @@ if (get_post('RefreshInquiry')) {
 	$table->set_sql($sql);
 	$table->set_columns($cols);
 }
+$table->width = "85%";
 start_form();
 
 display_db_pager($table);