Form submit/escape hotkeys added.

[fa-stable.git] / sales / allocations / customer_allocate.php

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 39076ec19fce4b1b0342fac31fa0c8fbfddc29ca..b709c751f34a0166ebb8547310514c4a7794a016 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $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 "<br>";
 
-       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("<a href='#' name='Alloc$counter' onclick='allocate_all(this.name.substr(5));return true;'>"
                                         . _("All") . "</a>");
                        label_cell("<a href='#' name='DeAll$counter' onclick='allocate_none(this.name.substr(5));return true;'>"
-                                        . _("None") . "</a>".hidden("un_allocated" . $counter, $un_allocated, false));
+                                        . _("None") . "</a>".hidden("un_allocated" . $counter, price_format($un_allocated), false));
                        end_row();
 
            $total_allocated += input_num('amount' . $counter);
@@ -243,15 +252,15 @@ function edit_allocations_for_transaction($type, $trans_no)
 
                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();