Fixed bug [0000116] - & display issue

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

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 87ea76ecca9da474dd587e6002c8d2c65705e550..90ac0da6313f05ac905f895a8f825938bf3d495c 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    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 = 1;
 $path_to_root="../..";
 include($path_to_root . "/includes/db_pager.inc");
@@ -45,9 +54,7 @@ cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
 submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
 end_row();
 end_table();
-
 end_form();
-
 set_global_customer($_POST['customer_id']);
 
 //------------------------------------------------------------------------------------------------
@@ -82,7 +89,7 @@ function display_customer_summary($customer_record)
        amount_cell($customer_record["Balance"]);
        end_row();
 
-       end_table();;
+       end_table();
 }
 //------------------------------------------------------------------------------------------------
 
@@ -120,8 +127,7 @@ function trans_view($trans)
 
 function due_date($row)
 {
-       return ($row["type"]==20 || $row["type"]==21)
-               ? $row["due_date"] : '';
+       return  $row["type"] == 10      ? $row["due_date"] : '';
 }
 
 function gl_view($row)
@@ -148,10 +154,10 @@ function fmt_credit($row)
 
 function credit_link($row)
 {
-       return $row['type'] == 10 ?
+       return $row['type'] == 10 && $row["TotalAmount"] - $row["Allocated"] > 0 ?
                pager_link(_("Credit This"),
                        "/sales/customer_credit_invoice.php?InvoiceNumber=".
-                       $row['trans_no'])
+                       $row['trans_no'], ICON_CREDIT)
                        : '';
 }
 
@@ -161,25 +167,32 @@ function edit_link($row)
 
        switch($row['type']) {
        case 10:
-               $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no'];
+               if (get_voided_entry(10, $row["trans_no"]) === false && $row['Allocated'] == 0)
+                       $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no'];
                break;
        case 11:
-               if ($row['order_']==0) // free-hand credit note
-                   $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no'];
-               else    // credit invoice
-                   $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no'];
+               if (get_voided_entry(11, $row["trans_no"]) === false && $row['Allocated'] == 0) // 2008-11-19 Joe Hunt
+               {        
+                       if ($row['order_']==0) // free-hand credit note
+                           $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no'];
+                       else    // credit invoice
+                           $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no'];
+               }           
                break;
         case 13:
-               $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no'];
+               if (get_voided_entry(13, $row["trans_no"]) === false)
+                       $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no'];
                break;
        }
-       return pager_link(_('Edit'), $str);
+       if ($str != "")
+               return pager_link(_('Edit'), $str, ICON_EDIT);
+       return '';      
 }
 
 function prt_link($row)
 {
-       if ($row['type'] != 12) // customer payment printout not defined yet.
-               return print_document_link($row['trans_no'], _("Print"), true, $row['type']);
+       if ($row['type'] != 12 && $row['type'] != 2) // customer payment or bank deposit printout not defined yet.
+               return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT);
 }
 
 function check_overdue($row)
@@ -258,8 +271,8 @@ $cols = array(
        _("#") => array('fun'=>'trans_view', 'ord'=>''),
        _("Order") => array('fun'=>'order_view'), 
        _("Reference"), 
-       _("Date") => array('type'=>'date', 'ord'=>'desc'),
-       _("Due Date") => array('type=>date', 'fun'=>'due_date'),
+       _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'),
+       _("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
        _("Customer") => array('ord'=>''), 
        _("Branch") => array('ord'=>''), 
        _("Currency") => array('align'=>'center'),
@@ -280,9 +293,13 @@ if ($_POST['customer_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);
 
 end_form();