X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=9d1cb8d9b238236d4ab99e340c5c9ec432b3c924;hb=f018b5112fc855b270528f1995f7ca6f80898564;hp=06e24e4fedec4bac5e93bd68c96a133214f163c2;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 06e24e4f..9d1cb8d9 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -21,30 +21,23 @@ 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);
//--------------------------------------------------------------------------------
start_form();
/* show all outstanding receipts and credits to be allocated */
- /*Clear any previous allocation records */
- if (isset($_SESSION['alloc']))
- {
- unset($_SESSION['alloc']->allocs);
- unset($_SESSION['alloc']);
- }
if (!isset($_POST['supplier_id']))
$_POST['supplier_id'] = get_global_supplier();
echo "
" . _("Select a Supplier: ") . " ";
- supplier_list('supplier_id', $_POST['supplier_id'], true, true);
+ echo supplier_list('supplier_id', $_POST['supplier_id'], true, true);
echo "
";
check(_("Show Settled Items:"), 'ShowSettled', null, true);
echo "
";
- end_form();
set_global_supplier($_POST['supplier_id']);
if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT))
@@ -76,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)
@@ -99,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'=>''),
@@ -117,15 +110,9 @@ if (isset($_POST['customer_id'])) {
$table =& new_db_pager('alloc_tbl', $sql, $cols);
$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
-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);
end_form();
end_page();
-?>
\ No newline at end of file