Paged transaction inquiries optimized for maximum links, continued.

[fa-stable.git] / sales / inquiry / customer_inquiry.php

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index feede0bd8242eda1e1d577fd52a825bcccf7816c..2183dd1b2ae4b15c91d5d2ddd6ab38ddb7117b85 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -70,9 +70,15 @@ function credit_link($row)
 
        if ($page_nested)
                return '';
-       return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
-               pager_link(_("Credit This") ,
-                       "/sales/customer_credit_invoice.php?InvoiceNumber=". $row['trans_no'], ICON_CREDIT):'';
+       if ($row["Outstanding"] > 0)
+       {
+               if ($row['type'] == ST_CUSTDELIVERY)
+                       return pager_link(_('Invoice'), "/sales/customer_invoice.php?DeliveryNumber=" 
+                               .$row['trans_no'], ICON_DOC);
+               else if ($row['type'] == ST_SALESINVOICE)
+                       return pager_link(_("Credit This") ,
+                       "/sales/customer_credit_invoice.php?InvoiceNumber=". $row['trans_no'], ICON_CREDIT);
+       }       
 }
 
 function edit_link($row)
@@ -160,6 +166,7 @@ if ($_POST['filterType'] != '2')
        date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
        date_cells(_("To:"), 'TransToDate', '', null);
 }
+check_cells(_("Zero values"), 'show_voided');
 
 submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 end_row();
@@ -184,7 +191,7 @@ if (get_post('RefreshInquiry') || list_updated('filterType'))
 }
 //------------------------------------------------------------------------------------------------
 $sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
-       get_post('customer_id'), get_post('filterType'));
+       get_post('customer_id'), get_post('filterType'), check_value('show_voided'));
 
 //------------------------------------------------------------------------------------------------
 //db_query("set @bal:=0");
@@ -202,8 +209,8 @@ $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'=>'credit_link'),
                array('insert'=>true, 'fun'=>'edit_link'),
+               array('insert'=>true, 'fun'=>'credit_link'),
                array('insert'=>true, 'fun'=>'prt_link')
        );