X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=c826462670c49053749edf8b62778df3a1c11249;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=b52f9ada86018edd000c88dc19f89e14790dc8bd;hpb=e000d0b3fb245b02de604356b1f60c65b5f4962f;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index b52f9ada..c8264626 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_SUPPLIERALLOC';
+$path_to_root = "../..";
include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
@@ -12,42 +21,26 @@ 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);
-
-//--------------------------------------------------------------------------------
-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'] );
-}
+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'] == reserved_words::get_all()))
+ if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT))
{
unset($_POST['supplier_id']);
}
@@ -62,7 +55,9 @@ start_form();
//--------------------------------------------------------------------------------
function systype_name($dummy, $type)
{
- return systypes::name($type);
+ global $systypes_array;
+
+ return $systypes_array[$type];
}
function trans_view($trans)
@@ -74,17 +69,17 @@ function alloc_link($row)
{
return pager_link(_("Allocate"),
"/purchasing/allocations/supplier_allocate.php?trans_no="
- .$row["trans_no"] . "&trans_type=" . $row["type"] );
+ .$row["trans_no"] . "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
}
function amount_left($row)
{
- return -$row["Total"]-$row["alloc"];
+ return price_format($row['type'] == ST_JOURNAL ? abs($row["Total"])-$row["alloc"] : -$row["Total"]-$row["alloc"]);
}
function amount_total($row)
{
- return -$row["Total"];
+ return price_format(-$row["Total"]);
}
function check_settled($row)
@@ -99,10 +94,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')
);
@@ -115,14 +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);
-}
-start_form();
+$table->width = "80%";
display_db_pager($table);
end_form();
end_page();
-?>
\ No newline at end of file