X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_types.php;h=c826ae4847dcc6e97b1a70e3760ea26e85c41b78;hb=13fae1ba1d78cff66e326a006be2f538dd404248;hp=336697e5089c1161d7cdf2b59c71db649707ea01;hpb=0b253e5e0d23400838d3bfb4f27fb3fb2637b3ab;p=fa-stable.git diff --git a/taxes/tax_types.php b/taxes/tax_types.php index 336697e5..c826ae48 100644 --- a/taxes/tax_types.php +++ b/taxes/tax_types.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_TAXRATES'; +$path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Tax Types")); +page(_($help_context = "Tax Types")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/taxes/db/tax_types_db.inc"); @@ -23,6 +23,8 @@ simple_page_mode(true); function can_process() { + global $selected_id; + if (strlen($_POST['name']) == 0) { display_error(_("The tax type name cannot be empty.")); @@ -36,6 +38,11 @@ function can_process() return false; } + if (!is_tax_gl_unique(get_post('sales_gl_code'), get_post('purchasing_gl_code'), $selected_id)) { + display_error( _("Selected GL Accounts cannot be used by another tax type.")); + set_focus('sales_gl_code'); + return false; + } return true; } @@ -65,10 +72,7 @@ if ($Mode=='UPDATE_ITEM' && can_process()) function can_delete($selected_id) { - $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_group_items WHERE tax_type_id=$selected_id"; - $result = db_query($sql, "could not query tax groups"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($selected_id, 'tax_group_items', 'tax_type_id')) { display_error(_("Cannot delete this tax type because tax groups been created referring to it.")); @@ -104,7 +108,9 @@ if ($Mode == 'RESET') $result = get_all_tax_types(check_value('show_inactive')); start_form(); -start_table($table_style); + +display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."), 0, 1); +start_table(TABLESTYLE); $th = array(_("Description"), _("Default Rate (%)"), _("Sales GL Account"), _("Purchasing GL Account"), "", ""); @@ -133,7 +139,7 @@ inactive_control_row($th); end_table(1); //----------------------------------------------------------------------------------- -start_table($table_style2); +start_table(TABLESTYLE2); if ($selected_id != -1) { @@ -163,4 +169,3 @@ end_form(); end_page(); -?>