projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in bank account edition.
[fa-stable.git]
/
purchasing
/
allocations
/
supplier_allocation_main.php
diff --git
a/purchasing/allocations/supplier_allocation_main.php
b/purchasing/allocations/supplier_allocation_main.php
index a3b04a532bc269663d29d31630bddb3e63c51615..c826462670c49053749edf8b62778df3a1c11249 100644
(file)
--- 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 = "";
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);
$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: ") . " ";
$_POST['supplier_id'] = get_global_supplier();
echo "<center>" . _("Select a Supplier: ") . " ";
- 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>";
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="
{
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)
{
}
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)
}
function amount_total($row)
@@
-116,4
+116,3
@@
display_db_pager($table);
end_form();
end_page();
end_form();
end_page();
-?>
\ No newline at end of file