X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=325d848ffd82b5a76cb8f5d3afe8dda68186ee85;hb=a5242af68e65661edb7175412444dce536a7f311;hp=c16cb253405f87e918fbb0797a4304a903ebcc38;hpb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index c16cb253..325d848f 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_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");
@@ -46,7 +55,6 @@ set_global_customer($_POST['customer_id']);
 end_row();
 end_table();
 end_form();
-
 //------------------------------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -73,12 +81,12 @@ function view_link($trans)
 
 function due_date($row)
 {
-	return $row["type"] == 10 ? sql2date($row["due_date"]) : '';
+	return $row["type"] == 10 ? $row["due_date"] : '';
 }
 
 function fmt_balance($row)
 {
-	return price_format($row["TotalAmount"] - $row["Allocated"]);
+	return $row["TotalAmount"] - $row["Allocated"];
 }
 
 function alloc_link($row)
@@ -86,7 +94,7 @@ function alloc_link($row)
 	$link = 
 	pager_link(_("Allocation"),
 		"/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] 
-		."&trans_type=" . $row["type"]);
+		."&trans_type=" . $row["type"], ICON_MONEY);
 
 	if ($row["type"] == 11 && $row['TotalAmount'] > 0)
 	{
@@ -188,51 +196,41 @@ function fmt_credit($row)
 		."trans.ov_freight + trans.ov_freight_tax + "
 		."trans.ov_discount) - trans.alloc,6) != 0) ";
    	}
-
-//    $sql .= " ORDER BY trans.tran_date";
-
-/*
-if (db_num_rows($result) == 0)
-{
-	display_note(_("The selected customer has no transactions for the given dates."), 1, 1);
-} else {
-*/
-//	start_table("$table_style width='80%'");
 //------------------------------------------------------------------------------------------------
+
 $cols = array(
-	_("Type") => array('type'=>'spec', 'fun'=>'systype_name'),
-	_("Number") => array('type'=>'spec', 'fun'=>'view_link'),
+	_("Type") => array('fun'=>'systype_name'),
+	_("#") => array('fun'=>'view_link'),
 	_("Reference"), 
-	_("Order") => array('type'=>'spec', 'fun'=>'order_link'), 
-	_("Date") => array('type'=>'date', 'ord'=>'asc'),
-	_("Due Date") => array('type'=>'spec', 'fun'=>'due_date'),
+	_("Order") => array('fun'=>'order_link'), 
+	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
+	_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
 	_("Customer"), 
-	_("Currency"),
-	_("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), 
-	_("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), 
+	_("Currency") => array('align'=>'center'),
+	_("Debit") => array('align'=>'right','fun'=>'fmt_debit'), 
+	_("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), 
 	_("Allocated") => 'amount', 
-	_("Balance") => array('type'=>'insert', 'fun'=>'fmt_balance'),
-	array('type'=>'insert', 'fun'=>'alloc_link')
+	_("Balance") => array('type'=>'amount', 'insert'=>true, 'fun'=>'fmt_balance'),
+	array('insert'=>true, 'fun'=>'alloc_link')
 	);
 
 if ($_POST['customer_id'] != reserved_words::get_all()) {
-	array_remove($cols, 6, 2);
+	$cols[_("Customer")] = 'skip';
+	$cols[_("Currency")] = 'skip';
 }
 
 $table =& new_db_pager('doc_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('doc_tbl');
+	$table->set_columns($cols);
 }
+$table->width = "80%";
+start_form();
 
-	start_form();
-	display_db_pager($table);
-	end_form();
-end_page();
-
+display_db_pager($table);
 
+end_form();
+end_page();
 ?>