X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocate.php;h=fd617a2903b694765cd6f0391b1ec98ddeee2e1f;hb=ab79693b43787b7b91a696a56d6287d87cfebdc1;hp=7ca1a76404a03903f4a49723d14bd10cf4370cb5;hpb=de320b43ef41373a90d9061483b6e8970947fdfa;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index 7ca1a764..fd617a29 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -1,17 +1,15 @@
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;
}
@@ -80,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;
@@ -94,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;
}
@@ -115,7 +117,6 @@ if (isset($_POST['Process']))
handle_process();
$_POST['Cancel'] = 1;
}
- $Ajax->update('_page_body');
}
//--------------------------------------------------------------------------------
@@ -125,10 +126,6 @@ if (isset($_POST['Cancel']))
clear_allocations();
meta_forward($path_to_root . "/purchasing/allocations/supplier_allocation_main.php");
}
-if (isset($_POST['UpdateDisplay']))
-{
- $Ajax->update('_page_body');
-}
//--------------------------------------------------------------------------------
function get_allocations_for_transaction($type, $trans_no)
@@ -190,6 +187,7 @@ function edit_allocations_for_transaction($type, $trans_no)
echo "
";
+ div_start('alloc_tbl');
if (count($_SESSION['alloc']->allocs) > 0)
{
start_table($table_style);
@@ -210,20 +208,15 @@ 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") . "".hidden("un_allocated" . $counter, $un_allocated, false));
-
-// label_cell("" . _("All") . "");
-// label_cell("" . _("None") . "");
end_row();
$total_allocated += input_num('amount' . $counter);
@@ -245,22 +238,20 @@ function edit_allocations_for_transaction($type, $trans_no)
end_table();
hidden('TotalNumberOfAllocs', $counter);
-// hidden('left_to_allocate', $left_to_allocate);
- echo "