Fixed extension module update and deletion.

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

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c00b0613d05d90052d4d63d3014c47b69d8c3672..0ff509844042ce390dfb55ada9206bc491bdc0d1 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();
@@ -80,7 +89,7 @@ function display_supplier_summary($supplier_record)
 //------------------------------------------------------------------------------------------------
 
 div_start('totals_tbl');
-if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::get_all()))
+if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
 {
        $supplier_record = get_supplier_details($_POST['supplier_id']);
     display_supplier_summary($supplier_record);
@@ -95,7 +104,8 @@ if(get_post('RefreshInquiry'))
 //------------------------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
-       return systypes::name($type);
+       global $systypes_array;
+       return $systypes_array[$type];
 }
 
 function trans_view($trans)
@@ -105,8 +115,7 @@ function trans_view($trans)
 
 function due_date($row)
 {
-       return ($row["type"]== 20) || ($row["type"]== 21)
-                ? $row["due_date"] : '';
+       return ($row["type"]== ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT) ? $row["due_date"] : '';
 }
 
 function gl_view($row)
@@ -116,7 +125,7 @@ function gl_view($row)
 
 function credit_link($row)
 {
-       return $row['type'] == 20 && $row["TotalAmount"] - $row["Allocated"] > 0 ?
+       return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ?
                pager_link(_("Credit This"),
                        "/purchasing/supplier_credit.php?New=1&invoice_no=".
                        $row['trans_no'], ICON_CREDIT)
@@ -162,31 +171,32 @@ function check_overdue($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,
        (ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount - trans.alloc) <= 0.005) AS Settled
        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())
-               $sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
-       if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
+       AND trans.tran_date <= '$date_to'
+               AND trans.ov_amount != 0";      // exclude voided transactions
+       if ($_POST['supplier_id'] != ALL_TEXT)
+               $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+       if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
        {
                if (($_POST['filterType'] == '1')) 
                {
-                       $sql .= " AND (trans.type = 20 OR trans.type = 2)";
+                       $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
                } 
                elseif (($_POST['filterType'] == '2')) 
                {
-                       $sql .= " AND trans.type = 20 ";
+                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
                } 
                elseif ($_POST['filterType'] == '3') 
                {
-                       $sql .= " AND (trans.type = 22 OR trans.type = 1) ";
+                       $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
                } 
                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')) 
@@ -202,7 +212,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'), 
@@ -211,7 +221,7 @@ $cols = array(
                        array('insert'=>true, 'fun'=>'credit_link')
                        );
 
-if ($_POST['supplier_id'] != reserved_words::get_all())
+if ($_POST['supplier_id'] != ALL_TEXT)
 {
        $cols[_("Supplier")] = 'skip';
        $cols[_("Currency")] = 'skip';
@@ -223,10 +233,7 @@ 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')) {
-       $table->set_sql($sql);
-       $table->set_columns($cols);
-}
+$table->width = "85%";
 start_form();
 
 display_db_pager($table);