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 30b11bfbc08c35a45a83aac5ce95c01a414bf38c..89383141a161f41b3561143d6e6d8e0fa2a4a697 100644 (file)
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -70,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)
@@ -80,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;
@@ -99,7 +101,7 @@ function alloc_link($row)
                "/purchasing/allocations/supplier_allocate.php?trans_no=" .
                        $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 : '';
 }
@@ -133,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'))
@@ -185,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';
 }
@@ -194,10 +196,6 @@ 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();