X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=13990c38bb4bdafce31e6257a1c508fb71d886cb;hb=02dd4aefa3e3babb64d61140bb7f7de14e37f755;hp=fdc065101a2b68ec224448d996128647102921b9;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php index fdc06510..13990c38 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"); @@ -13,22 +22,13 @@ include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/taxes/db/tax_groups_db.inc"); include_once($path_to_root . "/taxes/db/tax_types_db.inc"); -if (isset($_GET['selected_id'])) -{ - $selected_id = $_GET['selected_id']; -} -elseif(isset($_POST['selected_id'])) -{ - $selected_id = $_POST['selected_id']; -} -else - $selected_id = -1; +simple_page_mode(true); check_db_has_tax_types(_("There are no tax types defined. Define tax types before defining tax groups.")); //----------------------------------------------------------------------------------- -if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) +if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') { //initialise no input errors assumed initially before we test @@ -38,23 +38,26 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) { $input_error = 1; 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.")); + display_error( _("An entered tax rate is invalid or less than zero.")); $input_error = 1; - break; + set_focus('rate'); + break; } } } - + */ if ($input_error != 1) { @@ -65,27 +68,28 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['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); } } if ($selected_id != -1) { - - update_tax_group($selected_id, $_POST['name'], $_POST['tax_shipping'], $taxes, + update_tax_group($selected_id, $_POST['name'], $_POST['tax_shipping'], $taxes, $rates); - + display_notification(_('Selected tax group has been updated')); } else { - - add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates); + add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates); + display_notification(_('New tax group has been added')); } - meta_forward($_SERVER['PHP_SELF']); + $Mode = 'RESET'; } } @@ -95,21 +99,15 @@ 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"; - $result = db_query($sql, "could not query customers"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($selected_id, 'cust_branch', 'tax_group_id')) { - display_note(_("Cannot delete this tax group because customer branches been created referring to it.")); + display_error(_("Cannot delete this tax group because customer branches been created referring to it.")); return false; } - $sql = "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE tax_group_id=$selected_id"; - $result = db_query($sql, "could not query suppliers"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($selected_id, 'suppliers', 'tax_group_id')) { - display_note(_("Cannot delete this tax group because suppliers been created referring to it.")); + display_error(_("Cannot delete this tax group because suppliers been created referring to it.")); return false; } @@ -120,22 +118,32 @@ function can_delete($selected_id) //----------------------------------------------------------------------------------- -if (isset($_GET['delete'])) +if ($Mode == 'Delete') { if (can_delete($selected_id)) { delete_tax_group($selected_id); - meta_forward($_SERVER['PHP_SELF']); + display_notification(_('Selected tax group has been deleted')); } + $Mode = 'RESET'; } +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; @@ -151,30 +159,27 @@ 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 "" . $myrow["type" . $i] . "";*/ - edit_link_cell("selected_id=" . $myrow["id"]); - delete_link_cell("selected_id=" . $myrow["id"]. "&delete=1"); + inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id'); + edit_button_cell("Edit".$myrow["id"], _("Edit")); + delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row();; } -end_table(); +inactive_control_row($th); +end_table(1); //----------------------------------------------------------------------------------- -hyperlink_no_params($_SERVER['PHP_SELF'], _("New Tax Group")); - -start_form(); - start_table($table_style2); if ($selected_id != -1) { //editing an existing status code - if (!isset($_POST['name'])) - { + if ($Mode == 'Edit') { $group = get_tax_group($selected_id); $_POST['name'] = $group["name"]; @@ -189,6 +194,7 @@ if ($selected_id != -1) $_POST['rate' . $i] = percent_format($tax_item["rate"]); $i ++; } + while($i<5) unset($_POST['tax_type_id'.$i++]); } hidden('selected_id', $selected_id); @@ -201,31 +207,34 @@ end_table(); display_note(_("Select the taxes that are included in this group."), 1); start_table($table_style2); -$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)")); +//$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)")); +//Editable rate has been removed 090920 Joe Hunt +$th = array(_("Tax"), _("Rate (%)")); table_header($th); 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()) + if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != ALL_NUMERIC) { - $default_rate = get_tax_type_default_rate($_POST['tax_type_id' . $i]); label_cell(percent_format($default_rate), "nowrap align=right"); - if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "") - $_POST['rate' . $i] = percent_format($default_rate); - small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i]); + //Editable rate has been removed 090920 Joe Hunt + //if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "") + // $_POST['rate' . $i] = percent_format($default_rate); + //small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i], null, null, + // user_percent_dec()); } end_row(); } end_table(1); -submit_add_or_update_center(!isset($selected_id)); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form();