X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=2bef7bab9164ee09a0cdb9b518aad507c5786253;hb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;hp=69be12080bf6e6ce0d782f699b22879366db9c07;hpb=b956923926de6b7eecf57510cf86857354cac1b3;p=fa-stable.git

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 69be1208..2bef7bab 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -1,13 +1,13 @@
 <?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.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $path_to_root="../..";
 $page_security = 3;
@@ -25,15 +25,6 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_("Supplier Allocations"), false, false, "", $js);
 
-//--------------------------------------------------------------------------------
-if ($ret = context_restore()) {
-	if(isset($ret['supplier_id']))
-		$_POST['supplier_id'] = $ret['supplier_id'];
-}
-if (isset($_POST['_supplier_id_editor'])) {
-	context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'] );
-}
-
 //--------------------------------------------------------------------------------
 
 start_form();
@@ -88,12 +79,12 @@ function alloc_link($row)
 
 function amount_left($row)
 {
-	return -$row["Total"]-$row["alloc"];
+	return price_format(-$row["Total"]-$row["alloc"]);
 }
 
 function amount_total($row)
 {
-	return -$row["Total"];
+	return price_format(-$row["Total"]);
 }
 
 function check_settled($row)
@@ -108,10 +99,10 @@ $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'),
 	_("Supplier") => array('ord'=>''),
 	_("Currency") => array('align'=>'center'),
-	_("Total") => 'amount', 
+	_("Total") => array('align'=>'right', 'fun'=>'amount_total'), 
 	_("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'), 
 	array('insert'=>true, 'fun'=>'alloc_link')
 	);
@@ -128,6 +119,7 @@ if (get_post('_ShowSettled_update') || get_post('_supplier_id_update') ) {
 	$table->set_sql($sql);
 	$table->set_columns($cols);
 }
+$table->width = "80%";
 start_form();
 
 display_db_pager($table);