2.0 Release Candidate 2

[fa-stable.git] / taxes / tax_groups.php

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index fdc065101a2b68ec224448d996128647102921b9..e7f99f21e86b3b213ec66d7a9535caca1d6a6375 100644 (file)
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -38,6 +38,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
        {
                $input_error = 1;
                display_error(_("The tax group name cannot be empty."));
+               set_focus('name');
        } 
        else 
        {
@@ -48,9 +49,10 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                        $_POST['tax_type_id' . $i] != reserved_words::get_all_numeric() && 
                        !check_num('rate' . $i, 0))
                {
-                               display_error( _("An entered tax rate is invalid or less than zero."));
+                       display_error( _("An entered tax rate is invalid or less than zero."));
                        $input_error = 1;
-                               break;
+                       set_focus('rate');
+                       break;
                }
        }
        }
@@ -208,7 +210,7 @@ for ($i = 0; $i < 5; $i++)
        start_row();
        if (!isset($_POST['tax_type_id' . $i]))
                $_POST['tax_type_id' . $i] = 0;
-       tax_types_list_cells(null, 'tax_type_id' . $i, $_POST['tax_type_id' . $i], true, _("None"), true);
+       tax_types_list_cells(null, 'tax_type_id' . $i, $_POST['tax_type_id' . $i], _("None"), true);
 
        if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != reserved_words::get_all_numeric()) 
        {
@@ -218,7 +220,8 @@ for ($i = 0; $i < 5; $i++)
 
                if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "")
                        $_POST['rate' . $i] = percent_format($default_rate);
-               small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i]);
+               small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i], null, null, 
+                 user_percent_dec());
        }
        end_row();
 }