X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=24f3148300c3057d1a2fefca48e61032823f6155;hb=3d8405dc9f78b3141d63c574e53b21ba38e45c10;hp=b9669feb858445690d27efef649999e7c8d12bd1;hpb=e2f475311cfe6efc1aae1b08da1eadaa00744991;p=fa-stable.git

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index b9669feb..24f31483 100644
--- 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 Affero General Public License,
+	AGPL, 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/agpl-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();
 }
 //------------------------------------------------------------------------------------------------
 
@@ -95,8 +102,12 @@ if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_
 }
 div_end();
 
-
+if(get_post('RefreshInquiry'))
+{
+	$Ajax->activate('totals_tbl');
+}
 //------------------------------------------------------------------------------------------------
+
 function systype_name($dummy, $type)
 {
 	return systypes::name($type);
@@ -116,12 +127,8 @@ function trans_view($trans)
 
 function due_date($row)
 {
-	return $row["type"] == 10 ? sql2date($row["due_date"]) : '';
-}
-
-function fmt_balance($row)
-{
-	return price_format($row["TotalAmount"] - $row["Allocated"]);
+	return ($row["type"]==20 || $row["type"]==21)
+		? $row["due_date"] : '';
 }
 
 function gl_view($row)
@@ -146,23 +153,12 @@ function fmt_credit($row)
 	return $value>0 ? price_format($value) : '';
 }
 
-function alloc_link($row)
-{
-	if ($row['type'] == 10)
-		if ($row["TotalAmount"] - $row["Allocated"] > 0)
-			return pager_link(_("Allocation"),
-				"/sales/allocations/customer_allocate.php"
-				."?trans_no={$row['trans_no']}&trans_type="
-				.$row['type']);
-	return '';
-}
-
 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)
 			: '';
 }
 
@@ -172,25 +168,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)
@@ -223,7 +226,8 @@ function check_overdue($row)
 			.TB_PREF."cust_branch as branch
 		WHERE debtor.debtor_no = trans.debtor_no
 			AND trans.tran_date >= '$date_after'
-			AND trans.tran_date <= '$date_to'";
+			AND trans.tran_date <= '$date_to'
+			AND trans.branch_code = branch.branch_code";
 
    	if ($_POST['customer_id'] != reserved_words::get_all())
    		$sql .= " AND trans.debtor_no = '" . $_POST['customer_id'] . "'";
@@ -264,44 +268,40 @@ function check_overdue($row)
 //------------------------------------------------------------------------------------------------
 
 $cols = array(
-	_("Type") => array('type'=>'spec', 'fun'=>'systype_name', 'ord'=>''),
-	_("#") => array('type'=>'spec', 'fun'=>'trans_view', 'ord'=>''),
-	_("Order") => array('type'=>'spec', 'fun'=>'order_view'), 
+	_("Type") => array('fun'=>'systype_name', 'ord'=>''),
+	_("#") => array('fun'=>'trans_view', 'ord'=>''),
+	_("Order") => array('fun'=>'order_view'), 
 	_("Reference"), 
 	_("Date") => array('type'=>'date', 'ord'=>'desc'),
-	_("Due Date") => array('type'=>'spec', 'fun'=>'due_date'),
+	_("Due Date") => array('type=>date', 'fun'=>'due_date'),
 	_("Customer") => array('ord'=>''), 
 	_("Branch") => array('ord'=>''), 
-	_("Currency"),
-	_("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), 
-	_("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), 
-		array('type'=>'insert', 'fun'=>'alloc_link'),
-		array('type'=>'insert', 'fun'=>'credit_link'),
-		array('type'=>'insert', 'fun'=>'edit_link'),
-		array('type'=>'insert', 'fun'=>'prt_link')
+	_("Currency") => array('align'=>'center'),
+	_("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
+	_("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), 
+		array('insert'=>true, 'fun'=>'gl_view'),
+		array('insert'=>true, 'fun'=>'credit_link'),
+		array('insert'=>true, 'fun'=>'edit_link'),
+		array('insert'=>true, 'fun'=>'prt_link')
 	);
 
 if ($_POST['customer_id'] != reserved_words::get_all()) {
-	array_remove($cols, 6);
-	array_remove($cols, 8);
+	$cols[_("Customer")] = 'skip';
+	$cols[_("Currency")] = 'skip';
 }
 
 
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-
-if(get_post('RefreshInquiry'))
-{
+if (get_post('RefreshInquiry')) {
 	$table->set_sql($sql);
-	$Ajax->activate('trans_tbl');
-	$Ajax->activate('totals_tbl');
+	$table->set_columns($cols);
 }
+start_form();
+display_db_pager($table);
 
-	start_form();
-	display_db_pager($table);
-	end_form();
+end_form();
 end_page();
 
-
 ?>