X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fallocations%2Fcustomer_allocate.php;h=f32db9616270d6c6dc9545ed5035ae3ba251458d;hb=4098636a10a25952a38e1b0c8f6e80dff44ae4e7;hp=39076ec19fce4b1b0342fac31fa0c8fbfddc29ca;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 39076ec1..f32db961 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$path_to_root="../..";
$page_security = 3;
@@ -54,7 +63,7 @@ function check_data()
/*Now check to see that the AllocAmt is no greater than the
amount left to be allocated against the transaction under review */
- if (input_num('amount' . $counter) > $_POST['un_allocated' . $counter])
+ if (input_num('amount' . $counter) > input_num('un_allocated' . $counter))
{
//$_POST['amount' . $counter] = $_POST['un_allocated' . $counter];
}
@@ -186,7 +195,7 @@ function edit_allocations_for_transaction($type, $trans_no)
echo "
";
- start_form(false, true);
+ start_form();
div_start('alloc_tbl');
if (count($_SESSION['alloc']->allocs) > 0)
{
@@ -219,7 +228,7 @@ function edit_allocations_for_transaction($type, $trans_no)
label_cell(""
. _("All") . "");
label_cell(""
- . _("None") . "".hidden("un_allocated" . $counter, $un_allocated, false));
+ . _("None") . "".hidden("un_allocated" . $counter, price_format($un_allocated), false));
end_row();
$total_allocated += input_num('amount' . $counter);
@@ -227,7 +236,7 @@ function edit_allocations_for_transaction($type, $trans_no)
}
label_row(_("Total Allocated"), price_format($total_allocated),
- "colspan=6 align=right", "nowrap align=right id='total_allocated'");
+ "colspan=6 align=right", "nowrap align=right id='total_allocated'", 3);
if ($_SESSION['alloc']->amount - $total_allocated < 0)
{
$font1 = "";
@@ -238,20 +247,20 @@ function edit_allocations_for_transaction($type, $trans_no)
$left_to_allocate = $_SESSION['alloc']->amount - $total_allocated;
$left_to_allocate = price_format($left_to_allocate);
label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2,
- "colspan=6 align=right ", "nowrap align=right id='left_to_allocate'");
+ "colspan=6 align=right ", "nowrap align=right id='left_to_allocate'", 3);
end_table(1);
hidden('TotalNumberOfAllocs', $counter);
submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true);
- submit('Process', _("Process"), true, _('Process allocations'), true);
- submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), true);
+ submit('Process', _("Process"), true, _('Process allocations'), 'default');
+ submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), 'cancel');
}
else
{
display_note(_("There are no unsettled transactions to allocate."), 0, 1);
submit_center('Cancel', _("Back to Allocations"), true,
- _('Abandon allocations and return to selection of allocatable amounts'), true);
+ _('Abandon allocations and return to selection of allocatable amounts'), 'cancel');
}
div_end();
end_form();