Fixed many minor bugs, new ones as well as debtor_trans related.

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

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index e1fd9ea2cac4bb3e9826bff7134380fa3f35a8dc..74c0573ebbc9356f78e80354d4c695a4faa06fa6 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -13,7 +13,7 @@ $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 
-add_js_allocate();
+add_js_file('allocate.js');
 
 page(_("Allocate Customer Payment or Credit Note"), false, false, "", $js);
 
@@ -41,12 +41,14 @@ function check_data()
                if (!check_num('amount' . $counter))
                {
                        display_error(_("The entry for one or more amounts is invalid."));
+                       set_focus('amount'.$counter);
                        return false;
                }
 
                if (!check_num('amount' . $counter,0))
                {
                        display_error(_("The entry for an amount to allocate was negative. A positive allocation amount is expected."));
+               set_focus('amount'.$counter);
                        return false;
                }
 
@@ -174,8 +176,6 @@ function edit_allocations_for_transaction($type, $trans_no)
 {
        global $table_style;
 
-       start_form(false, true);
-
     display_heading(sprintf(_("Allocation of %s # %d"), systypes::name($_SESSION['alloc']->type),$_SESSION['alloc']->trans_no));
 
     display_heading($_SESSION['alloc']->person_name);
@@ -185,6 +185,8 @@ function edit_allocations_for_transaction($type, $trans_no)
 
     echo "<br>";
 
+       start_form(false, true);
+
     if (count($_SESSION['alloc']->allocs) > 0)
     {
                start_table($table_style);
@@ -212,13 +214,15 @@ function edit_allocations_for_transaction($type, $trans_no)
            amount_cells(null, 'amount' . $counter, $_POST['amount' . $counter]);
 
                $un_allocated = round($allocn_item->amount - $allocn_item->amount_allocated, 6);
-               hidden("un_allocated" . $counter, $un_allocated);
+               //hidden("un_allocated" . $counter, $un_allocated);
                amount_cell($un_allocated);
 
-                       label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>"
+                       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>");
+                       //label_cell("<a href='#' name='DeAll$counter' onclick='allocate_none(this.name.substr(5));return true;'>"
+                       //               . _("None") . "</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));
                        end_row();
 
            $total_allocated += input_num('amount' . $counter);
@@ -244,14 +248,14 @@ function edit_allocations_for_transaction($type, $trans_no)
 //             hidden('left_to_allocate', $left_to_allocate);
                submit_center_first('UpdateDisplay', _("Update"));
                submit('Process', _("Process"));
+               submit_center_last('Cancel', _("Back to Allocations"));
        }
        else
        {
        display_note(_("There are no unsettled transactions to allocate."), 0, 1);
+               submit_center('Cancel', _("Back to Allocations"));
     }
 
-       submit_center_last('Cancel', _("Back to Allocations"));
-
        end_form();
 }