X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=taxes%2Ftax_groups.php;h=bf888159043376a45cfdcb14c72bec0f5d09707f;hb=0c07d137e821125e2bbd3034c01ce4cbc376d00b;hp=398d6255f485aff7b1e32db5cd13c8435585e4d4;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php index 398d6255..bf888159 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 @@ -40,13 +40,14 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['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.")); @@ -56,7 +57,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) } } } - + */ if ($input_error != 1) { @@ -67,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'; } } @@ -97,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; } @@ -122,22 +118,34 @@ 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(TABLESTYLE); +$th = array(_("Description"), _("Shipping Tax"), "", ""); +inactive_control_column($th); -start_table($table_style); -$th = array(_("Description"), _("Tax Shipping"), "", ""); table_header($th); $k = 0; @@ -153,30 +161,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 "