X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fallocations%2Fsupplier_allocate.php;h=995b2735da945fc3e30bc1645cb38ebd0663bad2;hb=8a53629bf51fc682489f6692ff4d6558a976c22c;hp=2f93c1a9829e6ddee275a8b981af1ba2a144669c;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index 2f93c1a9..995b2735 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -1,26 +1,23 @@
allocs);
unset($_SESSION['alloc']);
}
-
session_register("alloc");
}
-
//--------------------------------------------------------------------------------
function check_data()
{
$total_allocated = 0;
- for ($counter=0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
+ for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
{
-
if (!check_num('amount' . $counter, 0))
{
display_error(_("The entry for one or more amounts is invalid or negative."));
- set_focus('amount');
+ set_focus('amount'.$counter);
return false;
}
@@ -110,7 +104,7 @@ function handle_process()
if (isset($_POST['Process']))
{
- if (check_data())
+ if (check_data())
{
handle_process();
$_POST['Cancel'] = 1;
@@ -123,9 +117,7 @@ if (isset($_POST['Cancel']))
{
clear_allocations();
meta_forward($path_to_root . "/purchasing/allocations/supplier_allocation_main.php");
- exit;
}
-
//--------------------------------------------------------------------------------
function get_allocations_for_transaction($type, $trans_no)
@@ -187,12 +179,13 @@ function edit_allocations_for_transaction($type, $trans_no)
echo "
";
+ div_start('alloc_tbl');
if (count($_SESSION['alloc']->allocs) > 0)
{
start_table($table_style);
- $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
+ $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
_("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'');
- table_header($th);
+ table_header($th);
$k = $counter = $total_allocated = 0;
@@ -207,57 +200,50 @@ function edit_allocations_for_transaction($type, $trans_no)
amount_cell($alloc_item->amount);
amount_cell($alloc_item->amount_allocated);
- if (!isset($_POST['amount' . $counter]) || $_POST['amount' . $counter] == "")
- $_POST['amount' . $counter] = price_format($alloc_item->current_allocated);
+ $_POST['amount' . $counter] = price_format($alloc_item->current_allocated);
amount_cells(null, "amount" . $counter, price_format('amount' . $counter));
$un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6);
- hidden("un_allocated" . $counter, $un_allocated);
amount_cell($un_allocated);
label_cell(""
. _("All") . "");
label_cell(""
- . _("None") . "");
-
-// label_cell("" . _("All") . "");
-// label_cell("" . _("None") . "");
+ . _("None") . "".hidden("un_allocated" . $counter, $un_allocated, false));
end_row();
$total_allocated += input_num('amount' . $counter);
$counter++;
}
-
+
label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()),
"colspan=6 align=right", "align=right id='total_allocated'");
if (-$_SESSION['alloc']->amount - $total_allocated < 0)
{
$font1 = "";
$font2 = "";
- }
+ }
else
$font1 = $font2 = "";
- $left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated);
- label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right",
+ $left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated);
+ label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right",
"nowrap align=right id='left_to_allocate'");
- end_table();
+ end_table();
hidden('TotalNumberOfAllocs', $counter);
-// hidden('left_to_allocate', $left_to_allocate);
- echo "