X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=be6834826fb4ac384790bca52af2552592be8935;hb=c8f27f36721cfd5e02e62965f40ff3c3933dbd7d;hp=335691e1e720443ca31461827ae36827ddb4fec5;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php index 335691e1..be683482 100644 --- a/taxes/tax_groups.php +++ b/taxes/tax_groups.php @@ -1,11 +1,20 @@ . +***********************************************************************/ +$page_security = 'SA_TAXGROUPS'; +$path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Tax Groups")); +page(_($help_context = "Tax Groups")); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -31,13 +40,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') display_error(_("The tax group name cannot be empty.")); set_focus('name'); } + /* Editable rate has been removed 090920 Joe Hunt else { // make sure any entered rates are valid for ($i = 0; $i < 5; $i++) { if (isset($_POST['tax_type_id' . $i]) && - $_POST['tax_type_id' . $i] != reserved_words::get_all_numeric() && + $_POST['tax_type_id' . $i] != ALL_NUMERIC && !check_num('rate' . $i, 0)) { display_error( _("An entered tax rate is invalid or less than zero.")); @@ -47,7 +57,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') } } } - + */ if ($input_error != 1) { @@ -58,10 +68,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') for ($i = 0; $i < 5; $i++) { if (isset($_POST['tax_type_id' . $i]) && - $_POST['tax_type_id' . $i] != reserved_words::get_any_numeric()) + $_POST['tax_type_id' . $i] != ANY_NUMERIC) { $taxes[] = $_POST['tax_type_id' . $i]; - $rates[] = input_num('rate' . $i); + $rates[] = get_tax_type_default_rate($_POST['tax_type_id' . $i]); + //Editable rate has been removed 090920 Joe Hunt + //$rates[] = input_num('rate' . $i); } } @@ -87,7 +99,7 @@ function can_delete($selected_id) { if ($selected_id == -1) return false; - $sql = "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE tax_group_id=$selected_id"; + $sql = "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE tax_group_id=".db_escape($selected_id); $result = db_query($sql, "could not query customers"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -96,7 +108,7 @@ function can_delete($selected_id) return false; } - $sql = "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE tax_group_id=$selected_id"; + $sql = "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE tax_group_id=".db_escape($selected_id); $result = db_query($sql, "could not query suppliers"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -126,15 +138,18 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //----------------------------------------------------------------------------------- -$result = get_all_tax_groups(); +$result = get_all_tax_groups(check_value('show_inactive')); start_form(); start_table($table_style); $th = array(_("Description"), _("Tax Shipping"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; @@ -150,22 +165,20 @@ while ($myrow = db_fetch($result)) label_cell(_("No")); /*for ($i=0; $i< 5; $i++) - if ($myrow["type" . $i] != reserved_words::get_all_numeric()) + if ($myrow["type" . $i] != ALL_NUMERIC) echo "