Fixed date format in supplier transactions table.

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

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c3c5b1b932a8964a75467eea38a8106607c767b3..e495c661743c792a22cf5c268f5d582df1db5d93 100644 (file)
--- 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 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.
+    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>.
+***********************************************************************/
 $page_security=2;
 $path_to_root="../..";
 include($path_to_root . "/includes/db_pager.inc");
@@ -45,9 +54,7 @@ submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
 
 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)
 {
@@ -111,6 +123,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"];
@@ -185,17 +206,18 @@ function check_overdue($row)
        }
 
 $cols = array(
-                       _("Type") => array('type'=>'spec', 'fun'=>'systype_name', 'ord'=>''), 
-                       _("#") => array('type'=>'spec', 'fun'=>'trans_view', 'ord'=>''), 
+                       _("Type") => array('fun'=>'systype_name', 'ord'=>''), 
+                       _("#") => array('fun'=>'trans_view', 'ord'=>''), 
                        _("Reference"), 
-                       _("Supplier") => 'text',
+                       _("Supplier"),
                        _("Supplier's Reference"), 
-                       _("Date") => array('type'=>'date', 'ord'=>'desc'), 
-                       _("Due Date") => array('type'=>'spec', 'fun'=>'due_date'), 
-                       _("Currency") => 'text',
-                       _("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), 
-                       _("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), 
-                       array('type'=>'insert', 'fun'=>'gl_view'),
+                       _("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 +232,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();
 
 ?>