Moving 2.0 development version to main trunk.

[fa-stable.git] / admin / void_transaction.php

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 8b6ab74686543fa4b37f557088f43e3c12cc816e..4b5669400032cc4cca1800f5a303eaff8699bbc1 100644 (file)
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -35,13 +35,13 @@ function voiding_controls()
        end_table(1);
 
     if (!isset($_POST['ProcessVoiding']))
-       submit_center('ProcessVoiding', _("Void Transaction"));
+       submit_center('ProcessVoiding', _("Void Transaction"), true, '', true);
     else 
     {
        
        display_note(_("Are you sure you want to void this transaction ? This action cannot be undone."), 0, 1);
-       submit_center_first('ConfirmVoiding', _("Proceed"));
-       submit_center_last('CancelVoiding', _("Cancel"));
+       submit_center_first('ConfirmVoiding', _("Proceed"), '', true);
+       submit_center_last('CancelVoiding', _("Cancel"), '', true);
     }
 
        end_form();
@@ -54,17 +54,20 @@ function check_valid_entries()
        if (!is_date($_POST['date_']))
        {
                display_error(_("The entered date is invalid."));
+               set_focus('date_');
                return false;
        }
        if (!is_date_in_fiscalyear($_POST['date_']))
        {
                display_error(_("The entered date is not in fiscal year."));
+               set_focus('date_');
                return false;
        }
 
        if (!is_numeric($_POST['trans_no']) OR $_POST['trans_no'] <= 0)
        {
                display_error(_("The transaction number is expected to be numeric and greater than zero."));
+               set_focus('trans_no');
                return false;
        }
 
@@ -85,6 +88,7 @@ function handle_void_transaction()
                        unset($_POST['trans_no']);
                        unset($_POST['memo_']);
                        unset($_POST['date_']);
+                       set_focus('trans_no');
                        return;
                }
 
@@ -98,8 +102,11 @@ function handle_void_transaction()
                        unset($_POST['memo_']);
                        unset($_POST['date_']);
                }
-               else
+               else {
                        display_error(_("The entered transaction does not exist or cannot be voided."));
+                       set_focus('trans_no');
+
+               }
        }
 }
 
@@ -116,11 +123,18 @@ if (isset($_POST['ProcessVoiding']))
 {
        if (!check_valid_entries())
                unset($_POST['ProcessVoiding']);
+       $Ajax->activate('_page_body');
 }
 
 if (isset($_POST['ConfirmVoiding']))
 {
        handle_void_transaction();
+       $Ajax->activate('_page_body');
+}
+
+if (isset($_POST['CancelVoiding']))
+{
+       $Ajax->activate('_page_body');
 }
 
 //----------------------------------------------------------------------------------------