Minor layout bug at Credit Shipping Costs in customer_credit_invoice.php

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

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index d349e5f23e6036bf3553678030a0360fbe0b2f2b..371e3e5aacbef94df515c7d0abe8429e6c61b2be 100644 (file)
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -4,13 +4,15 @@ $path_to_root="..";
 $page_security = 14;
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Void a Transaction"));
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/admin/db/voiding_db.inc");
+$js = "";
+if ($use_date_picker)
+       $js .= get_js_date_picker();
+page(_("Void a Transaction"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
 
@@ -52,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;
        }
 
@@ -83,6 +88,7 @@ function handle_void_transaction()
                        unset($_POST['trans_no']);
                        unset($_POST['memo_']);
                        unset($_POST['date_']);
+                       set_focus('trans_no');
                        return;
                }
 
@@ -96,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');
+
+               }
        }
 }