X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=c826462670c49053749edf8b62778df3a1c11249;hb=c640dae024fb9554d476bd863a68ef82ada8822d;hp=47360922f77a5f1cbb46cf9a1bc7d59a0df25138;hpb=262bd1ad81de77261f55c4eff87dc1c7fa6e7bfe;p=fa-stable.git

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 47360922..c8264626 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,11 +34,10 @@ 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>";
-	end_form();
 	set_global_supplier($_POST['supplier_id']);
 
 	if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT)) 
@@ -70,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)
@@ -112,10 +111,8 @@ $table =& new_db_pager('alloc_tbl', $sql, $cols);
 $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
 
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);
 
 end_form();
 end_page();
-?>
\ No newline at end of file