Bug 5682: Voided Invoices and PO Deliveries showing up in inquiries. Fixed.

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

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 89cebb65e7fc39097660d8e45b5e7f7ba464346f..c07ef3b2acf7db6f1a66bb10970ff008e126f24f 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -81,6 +81,8 @@ function due_date($row)
 
 function gl_view($row)
 {
+       if ($row['type'] == ST_SUPPRECEIVE && get_voided_entry(ST_SUPPRECEIVE, $row['trans_no']))
+               return set_icon(ICON_REMOVE, _("Voided."));
        return get_gl_view_str($row["type"], $row["trans_no"]);
 }
 
@@ -153,9 +155,10 @@ set_global_supplier($_POST['supplier_id']);
 //------------------------------------------------------------------------------------------------
 
 div_start('totals_tbl');
-if ($_POST['supplier_id'] != ALL_TEXT && $_POST['filterType'] == '2')
+
+if ($_POST['supplier_id'] != "" && $_POST['supplier_id'] != ALL_TEXT)
 {
-       $supplier_record = get_supplier_details(get_post('supplier_id'), get_post('TransToDate'));
+       $supplier_record = get_supplier_details(get_post('supplier_id'), get_post('TransToDate'), false);
     display_supplier_summary($supplier_record);
 }
 div_end();
@@ -181,9 +184,9 @@ $cols = array(
                        _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), 
                        _("Balance") => array('align'=>'right', 'type'=>'amount'),
                        array('insert'=>true, 'fun'=>'gl_view'),
+                       array('insert'=>true, 'fun'=>'edit_link'),
                        array('insert'=>true, 'fun'=>'credit_link'),
-                       array('insert'=>true, 'fun'=>'prt_link'),
-                       array('insert'=>true, 'fun'=>'edit_link')
+                       array('insert'=>true, 'fun'=>'prt_link')
                        );
 
 if ($_POST['supplier_id'] != ALL_TEXT)