Ajax additions

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

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index a37847201cd270783c4b7b50f67789ab306577a5..d92cf39a1c562568a29c5a94aebe3ddf8fd4af76 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -38,9 +38,9 @@ function check_data()
        for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
        {
 
-               if (!check_num('amount' . $counter))
+               if (!check_num('amount' . $counter, 0))
                {
-                       display_error(_("The entry for one or more amounts is invalid."));
+                       display_error(_("The entry for one or more amounts is invalid or negative."));
                        set_focus('amount'.$counter);
                        return false;
                }
@@ -109,7 +109,6 @@ function handle_process()
 
        clear_allocations();
 }
-
 //--------------------------------------------------------------------------------
 
 if (isset($_POST['Process']))
@@ -120,16 +119,13 @@ if (isset($_POST['Process']))
                $_POST['Cancel'] = 1;
        }
 }
-
 //--------------------------------------------------------------------------------
 
 if (isset($_POST['Cancel']))
 {
        clear_allocations();
        meta_forward($path_to_root . "/sales/allocations/customer_allocation_main.php");
-       exit;
 }
-
 //--------------------------------------------------------------------------------
 
 function get_allocations_for_transaction($type, $trans_no)
@@ -155,7 +151,6 @@ function get_allocations_for_transaction($type, $trans_no)
                        0); // this allocation
        }
 
-
        /* Now get trans that might have previously been allocated to by this trans
        NB existing entries where still some of the trans outstanding entered from
        above logic will be overwritten with the prev alloc detail below */
@@ -168,9 +163,7 @@ function get_allocations_for_transaction($type, $trans_no)
                        sql2date($myrow["tran_date"]), sql2date($myrow["due_date"]),
                        $myrow["Total"], $myrow["alloc"] - $myrow["amt"], $myrow["amt"]);
        }
-
 }
-
 //--------------------------------------------------------------------------------
 
 function edit_allocations_for_transaction($type, $trans_no)
@@ -187,7 +180,7 @@ function edit_allocations_for_transaction($type, $trans_no)
     echo "<br>";
 
        start_form(false, true);
-
+       div_start('alloc_tbl');
     if (count($_SESSION['alloc']->allocs) > 0)
     {
                start_table($table_style);
@@ -210,18 +203,14 @@ function edit_allocations_for_transaction($type, $trans_no)
                amount_cell($allocn_item->amount);
                        amount_cell($allocn_item->amount_allocated);
 
-           if (!check_num('amount' . $counter))
-               $_POST['amount' . $counter] = price_format($allocn_item->current_allocated);
-           amount_cells(null, 'amount' . $counter, $_POST['amount' . $counter]);
+           $_POST['amount' . $counter] = price_format($allocn_item->current_allocated);
+           amount_cells(null, 'amount' . $counter, price_format('amount' . $counter));
 
                $un_allocated = round($allocn_item->amount - $allocn_item->amount_allocated, 6);
-               //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;'>"
                                         . _("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>".hidden("un_allocated" . $counter, $un_allocated, false));
                        end_row();
@@ -246,17 +235,18 @@ function edit_allocations_for_transaction($type, $trans_no)
         end_table(1);
 
                hidden('TotalNumberOfAllocs', $counter);
-//             hidden('left_to_allocate', $left_to_allocate);
-               submit_center_first('UpdateDisplay', _("Update"));
-               submit('Process', _("Process"));
-               submit_center_last('Cancel', _("Back to Allocations"));
+               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);
        }
        else
        {
        display_note(_("There are no unsettled transactions to allocate."), 0, 1);
-               submit_center('Cancel', _("Back to Allocations"));
+               
+               submit_center('Cancel', _("Back to Allocations"), true,
+                       _('Abandon allocations and return to selection of allocatable amounts'), true);
     }
-
+       div_end();
        end_form();
 }
 
@@ -266,6 +256,14 @@ if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
 {
        get_allocations_for_transaction($_GET['trans_type'], $_GET['trans_no']);
 }
+if(get_post('UpdateDisplay'))
+{
+       $trans_no = $_SESSION['alloc']->trans_no;
+       $type = $_SESSION['alloc']->type;
+       clear_allocations();
+       get_allocations_for_transaction($type, $trans_no);
+       $Ajax->activate('alloc_tbl');
+}
 
 if (isset($_SESSION['alloc']))
 {