Code cleanup after db_pager optimization.

[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..89383141a161f41b3561143d6e6d8e0fa2a4a697 100644 (file)
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_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_SUPPLIERALLOC';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.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']);
 
@@ -61,7 +70,9 @@ function check_overdue($row)
 
 function systype_name($dummy, $type)
 {
-       return systypes::name($type);
+       global $systypes_array;
+       
+       return $systypes_array[$type];
 }
 
 function view_link($trans)
@@ -71,13 +82,13 @@ function view_link($trans)
 
 function due_date($row)
 {
-       return (($row["type"] == 20) || ($row["type"]== 21))
+       return (($row["type"] == ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT))
                ? $row["due_date"] : "";
 }
 
 function fmt_balance($row)
 {
-       $value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22)
+       $value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
                ? -$row["TotalAmount"] - $row["Allocated"]
                : $row["TotalAmount"] - $row["Allocated"];
        return $value;
@@ -88,9 +99,9 @@ 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) 
+       return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
                && (-$row["TotalAmount"] - $row["Allocated"]) > 0)
                ? $link : '';
 }
@@ -124,28 +135,28 @@ function fmt_credit($row)
                supplier.curr_code, 
        (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
                trans.alloc AS Allocated,
-               ((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+               ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
        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'";
-       if ($_POST['supplier_id'] != reserved_words::get_all())
+       if ($_POST['supplier_id'] != ALL_TEXT)
                $sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
-       if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
+       if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
        {
                if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
                {
-                       $sql .= " AND trans.type = 20 ";
+                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
                }
                elseif ($_POST['filterType'] == '3')
                {
-                       $sql .= " AND trans.type = 22 ";
+                       $sql .= " AND trans.type = ".ST_SUPPAYMENT." ";
                }
                elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
                {
-                       $sql .= " AND trans.type = 21 ";
+                       $sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
                }
 
                if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
@@ -162,11 +173,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'), 
@@ -176,7 +187,7 @@ $cols = array(
        array('insert'=>true, 'fun'=>'alloc_link')
        );
 
-if ($_POST['supplier_id'] != reserved_words::get_all()) {
+if ($_POST['supplier_id'] != ALL_TEXT) {
        $cols[_("Supplier")] = 'skip';
        $cols[_("Currency")] = 'skip';
 }
@@ -185,6 +196,7 @@ 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."));
 
+$table->width = "90%";
 start_form();
 
 display_db_pager($table);