X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=e874d53d3879c03ce968558f39e03f68b18e1e43;hb=389721f442ea4dc96ba1cafd65919e717e0d8746;hp=b0c3c6dedfa08bd8d0146dc2ee048df8ca8db1b3;hpb=827b3428d4c8c473cb637ac9df6621f4a0ba6f9a;p=fa-stable.git

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index b0c3c6de..e874d53d 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.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>.
+***********************************************************************/
 $path_to_root="../..";
 $page_security = 3;
 include($path_to_root . "/includes/db_pager.inc");
@@ -13,13 +22,6 @@ if ($use_popup_windows)
 page(_("Customer Allocations"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------
-if ($ret = context_restore()) {
-	if(isset($ret['customer_id']))
-		$_POST['customer_id'] = $ret['customer_id'];
-}
-if (isset($_POST['_customer_id_editor'])) {
-	context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'] );
-}
 
 start_form();
 	/* show all outstanding receipts and credits to be allocated */
@@ -38,8 +40,6 @@ start_form();
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
 	echo "</center><br><br>";
 
-end_form();
-
 	set_global_customer($_POST['customer_id']);
 
 	if (isset($_POST['customer_id']) && ($_POST['customer_id'] == reserved_words::get_all()))
@@ -76,13 +76,12 @@ function alloc_link($row)
 {
 	return pager_link(_("Allocate"),
 		"/sales/allocations/customer_allocate.php?trans_no="
-			.$row["trans_no"] . "&trans_type=" . $row["type"]		
-	);
+			.$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY);
 }
 
 function amount_left($row)
 {
-	return $row["Total"]-$row["alloc"];
+	return price_format($row["Total"]-$row["alloc"]);
 }
 
 function check_settled($row)
@@ -97,7 +96,7 @@ $cols = array(
 	_("Transaction Type") => array('fun'=>'systype_name'),
 	_("#") => array('fun'=>'trans_view'),
 	_("Reference"), 
-	_("Date") => array('type'=>'date', 'ord'=>'asc'),
+	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Customer") => array('ord'=>''),
 	_("Currency") => array('align'=>'center'),
 	_("Total") => 'amount', 
@@ -116,12 +115,11 @@ $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg',
 if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) {
 	$table->set_sql($sql);
 	$table->set_columns($cols);
-	$Ajax->activate('alloc_tbl');
 }
+$table->width = "75%";
 
-	start_form();
-	display_db_pager($table);
-	end_form();
-end_page();
+display_db_pager($table);
+end_form();
 
+end_page();
 ?>
\ No newline at end of file