Merged changes from main branch up to 2.1.3.

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

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index b9f7a8417ee3846773c4fccdf4c1c73712ccf080..1b99f73537d36384df1cfd6e6b7518dd4d785a2f 100644 (file)
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_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");
@@ -28,7 +37,7 @@ if (isset($_GET['ToDate']))
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
        $_POST['supplier_id'] = get_global_supplier();
@@ -45,7 +54,7 @@ supp_allocations_list_cell("filterType", null);
 
 check_cells(_("show settled:"), 'showSettled', null);
 
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 
 set_global_supplier($_POST['supplier_id']);
 
@@ -88,7 +97,7 @@ function alloc_link($row)
        $link = 
        pager_link(_("Allocations"),
                "/purchasing/allocations/supplier_allocate.php?trans_no=" .
-                       $row["trans_no"]. "&trans_type=" . $row["type"] );
+                       $row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
 
        return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) 
                && (-$row["TotalAmount"] - $row["Allocated"]) > 0)
@@ -162,11 +171,11 @@ function fmt_credit($row)
 
 $cols = array(
        _("Type") => array('fun'=>'systype_name'),
-       _("Number") => array('fun'=>'view_link', 'ord'=>''),
+       _("#") => array('fun'=>'view_link', 'ord'=>''),
        _("Reference"), 
        _("Supplier") => array('ord'=>''), 
        _("Supp Reference"),
-       _("Date") => array('type'=>'date', 'ord'=>'asc'),
+       _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
        _("Due Date") => array('fun'=>'due_date'),
        _("Currency") => array('align'=>'center'),
        _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
@@ -185,6 +194,11 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) {
 $table =& new_db_pager('doc_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 = "90%";
 start_form();
 
 display_db_pager($table);