X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocate.php;h=fd617a2903b694765cd6f0391b1ec98ddeee2e1f;hb=2aab14aed5938bc674997cff83c319bdf40490d6;hp=7ef2b2aa79147c47f115d91a597d21cd011b694c;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index 7ef2b2aa..fd617a29 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -1,22 +1,22 @@
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 (!is_numeric($_POST['amount' . $counter]))
+ if (!check_num('amount' . $counter, 0))
{
- display_error(_("The entry for one or more amounts is invalid."));
- return false;
- }
-
- if ($_POST['amount' . $counter] < 0)
- {
- display_error(_("The entry for an amount to allocate was negative. A positive allocation amount is expected."));
+ display_error(_("The entry for one or more amounts is invalid or negative."));
+ set_focus('amount'.$counter);
return false;
}
/*Now check to see that the AllocAmt is no greater than the
amount left to be allocated against the transaction under review */
- if ($_POST['amount' . $counter] > $_POST['un_allocated' . $counter])
+ if (input_num('amount' . $counter) > $_POST['un_allocated' . $counter])
{
//$_POST['amount' . $counter] = $_POST['un_allocated' . $counter];
}
- $_SESSION['alloc']->allocs[$counter]->current_allocated = $_POST['amount' . $counter];
+ $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
- $total_allocated += $_POST['amount' . $counter];
+ $total_allocated += input_num('amount' . $counter);
}
if ($total_allocated + $_SESSION['alloc']->amount > sys_prefs::allocation_settled_allowance())
@@ -82,7 +74,7 @@ function handle_process()
begin_transaction();
// clear all the allocations for this payment/credit
- clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no);
+ clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_);
// now add the new allocations
$total_allocated = 0;
@@ -96,6 +88,14 @@ function handle_process()
update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no,
$alloc_item->current_allocated);
+
+ // Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
+
+ exchange_variation($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
+ $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_,
+ $alloc_item->current_allocated, payment_person_types::supplier());
+
+ ///////////////////////////////////////////////////////////////////////////
$total_allocated += $alloc_item->current_allocated;
}
@@ -112,7 +112,7 @@ function handle_process()
if (isset($_POST['Process']))
{
- if (check_data())
+ if (check_data())
{
handle_process();
$_POST['Cancel'] = 1;
@@ -125,9 +125,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)
@@ -185,16 +183,17 @@ function edit_allocations_for_transaction($type, $trans_no)
display_heading($_SESSION['alloc']->person_name);
display_heading2(_("Date:") . " " . $_SESSION['alloc']->date_ . "");
- display_heading2(_("Total:") . " " . number_format2(-$_SESSION['alloc']->amount,user_price_dec()) . "");
+ display_heading2(_("Total:") . " " . price_format(-$_SESSION['alloc']->amount) . "");
echo "
";
+ div_start('alloc_tbl');
if (count($_SESSION['alloc']->allocs) > 0)
{
start_table($table_style);
- $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
- _("Other Allocations"), _("This Allocation"), _("Left to Allocate"));
- table_header($th);
+ $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
+ _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'');
+ table_header($th);
$k = $counter = $total_allocated = 0;
@@ -207,54 +206,52 @@ function edit_allocations_for_transaction($type, $trans_no)
label_cell($alloc_item->date_, "align=right");
label_cell($alloc_item->due_date, "align=right");
amount_cell($alloc_item->amount);
- amount_cell($alloc_item->amount_allocated);
+ amount_cell($alloc_item->amount_allocated);
- if (!isset($_POST['amount' . $counter]) || $_POST['amount' . $counter] == "")
- $_POST['amount' . $counter] = $alloc_item->current_allocated;
- text_cells(null, "amount" . $counter, $_POST['amount' . $counter], 13, 12);
+ $_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") . "".hidden("un_allocated" . $counter, $un_allocated, false));
end_row();
- $total_allocated += $_POST['amount' . $counter];
+ $total_allocated += input_num('amount' . $counter);
$counter++;
}
-
+
label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()),
- "colspan=6 align=right", "align=right");
+ "colspan=6 align=right", "align=right id='total_allocated'");
if (-$_SESSION['alloc']->amount - $total_allocated < 0)
{
$font1 = "";
$font2 = "";
- }
+ }
else
$font1 = $font2 = "";
- label_row(_("Left to Allocate"), $font1 . number_format2(-$_SESSION['alloc']->amount -
- $total_allocated,user_price_dec()) . $font2, "colspan=6 align=right",
- "nowrap align=right");
- end_table();
+ $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();
hidden('TotalNumberOfAllocs', $counter);
- echo "