Fixed newlines in js submit dialogs.

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

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c00b0613d05d90052d4d63d3014c47b69d8c3672..7de2319c5402ec106ec5c2165f804458ab0980fd 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security=2;
-$path_to_root="../..";
+/**********************************************************************
+    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 = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.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)
@@ -167,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())
@@ -202,7 +211,7 @@ $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'), 
@@ -227,6 +236,7 @@ if (get_post('RefreshInquiry')) {
        $table->set_sql($sql);
        $table->set_columns($cols);
 }
+$table->width = "85%";
 start_form();
 
 display_db_pager($table);