X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=aba3613593850c49b649cd2bedaf33d94c68b9b3;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=52b82ef92f54cb43eee991548a366a9ff039dbca;hpb=e000d0b3fb245b02de604356b1f60c65b5f4962f;p=fa-stable.git

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 52b82ef9..aba36135 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 1;
-$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_SALESTRANSVIEW';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
@@ -42,7 +51,7 @@ if (!isset($_POST['filterType']))
 
 cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
 
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 end_row();
 end_table();
 end_form();
@@ -118,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)
@@ -146,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)
 			: '';
 }
 
@@ -159,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 != "" && !is_closed_trans($row['type'], $row["trans_no"]))
+		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)
@@ -256,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'),
@@ -282,6 +297,8 @@ if (get_post('RefreshInquiry')) {
 	$table->set_sql($sql);
 	$table->set_columns($cols);
 }
+$table->width = "85%";
+
 start_form();
 display_db_pager($table);