X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_inquiry.php;h=6db3ef91ac0841056f48f2e56c7a2f10cbf1981d;hb=2f9305e3029ae7cd9398a9b0f900de11b9c8d5c1;hp=3f41b03e51cf64ea79fbee69aff52c819efc697c;hpb=b3eb4fd60e006f521b57bf974f21268f2dcc91c3;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 3f41b03e..6db3ef91 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,13 +50,11 @@ 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();
-
 end_form();
-
 set_global_supplier($_POST['supplier_id']);
 
 //------------------------------------------------------------------------------------------------
@@ -89,6 +96,11 @@ if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::g
 }
 div_end();
 
+if(get_post('RefreshInquiry'))
+{
+	$Ajax->activate('totals_tbl');
+}
+
 //------------------------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
@@ -102,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)
@@ -111,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"];
@@ -190,12 +210,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())
@@ -210,18 +231,16 @@ if ($_POST['supplier_id'] != reserved_words::get_all())
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-if(get_post('RefreshInquiry'))
-{
+if (get_post('RefreshInquiry')) {
 	$table->set_sql($sql);
 	$table->set_columns($cols);
-	$Ajax->activate('trans_tbl');
-	$Ajax->activate('totals_tbl');
 }
-
+$table->width = "85%";
 start_form();
+
 display_db_pager($table);
-end_form();
 
+end_form();
 end_page();
 
 ?>