[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

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

diff --git a/taxes/tax_types.php b/taxes/tax_types.php
index c76691830053dd31a44bf08aa1c9c30ef3ac1d4b..c826ae4847dcc6e97b1a70e3760ea26e85c41b78 100644 (file)
--- a/taxes/tax_types.php
+++ b/taxes/tax_types.php
@@ -38,7 +38,7 @@ function can_process()
                return false;
        }
 
-       if (!is_tax_gl_unique(get_post('sales_gl_code', 'purchasing_gl_code', $selected_id))) {
+       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;
@@ -72,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=".db_escape($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."));
 
@@ -112,8 +109,8 @@ $result = get_all_tax_types(check_value('show_inactive'));
 
 start_form();
 
-display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."));
-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"), "", "");
@@ -142,7 +139,7 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -172,4 +169,3 @@ end_form();
 
 end_page();
 
-?>