X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=9d1cb8d9b238236d4ab99e340c5c9ec432b3c924;hb=1c01c6f19f3a1410814abb63e4143d080373aaba;hp=a3b04a532bc269663d29d31630bddb3e63c51615;hpb=9437de4193bde74b4a77e6ddcafede09b500c241;p=fa-stable.git

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index a3b04a53..9d1cb8d9 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/includes/banking.inc");
 
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-page(_("Supplier Allocations"), false, false, "", $js);
+page(_($help_context = "Supplier Allocations"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------
 
@@ -34,7 +34,7 @@ start_form();
     	$_POST['supplier_id'] = get_global_supplier();
 
     echo "<center>" . _("Select a Supplier: ") . "&nbsp;&nbsp;";
-	supplier_list('supplier_id', $_POST['supplier_id'], true, true);
+	echo supplier_list('supplier_id', $_POST['supplier_id'], true, true);
     echo "<br>";
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
 	echo "</center><br><br>";
@@ -69,12 +69,12 @@ function alloc_link($row)
 {
 	return pager_link(_("Allocate"),
 		"/purchasing/allocations/supplier_allocate.php?trans_no="
-			.$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY );
+ 			.$row["trans_no"] . "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
 }
 
 function amount_left($row)
 {
-	return price_format(-$row["Total"]-$row["alloc"]);
+ 	return price_format($row['type'] == ST_JOURNAL ?  abs($row["Total"])-$row["alloc"] : -$row["Total"]-$row["alloc"]);
 }
 
 function amount_total($row)
@@ -92,7 +92,7 @@ $sql = get_allocatable_from_supp_sql($supplier_id, $settled);
 
 $cols = array(
 	_("Transaction Type") => array('fun'=>'systype_name'),
-	_("#") => array('fun'=>'trans_view'),
+	_("#") => array('fun'=>'trans_view', 'align'=>'right'),
 	_("Reference"), 
 	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Supplier") => array('ord'=>''),
@@ -116,4 +116,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>
\ No newline at end of file