Merged changes from main branch up to 2.1.3.

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

diff --git a/taxes/tax_types.php b/taxes/tax_types.php
index a7c538361c001d1628f03fc5d40f4ac1eb475f3c..af2a2e09f91dd85f097707cdec034aadba6385e2 100644 (file)
--- a/taxes/tax_types.php
+++ b/taxes/tax_types.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 3;
 $path_to_root="..";
@@ -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', '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;
 }
 
@@ -45,7 +52,7 @@ if ($Mode=='ADD_ITEM' && can_process())
 {
 
        add_tax_type($_POST['name'], $_POST['sales_gl_code'],
-               $_POST['purchasing_gl_code'], input_num('rate'));
+               $_POST['purchasing_gl_code'], input_num('rate', 0));
        display_notification(_('New tax type has been added'));
        $Mode = 'RESET';
 }
@@ -95,17 +102,22 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
+       $sav = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $sav;
 }
 //-----------------------------------------------------------------------------------
 
-$result = get_all_tax_types();
+$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);
 
 $th = array(_("Description"), _("Default Rate (%)"),
        _("Sales GL Account"), _("Purchasing GL Account"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -119,21 +131,17 @@ while ($myrow = db_fetch($result))
        label_cell($myrow["sales_gl_code"] . "&nbsp;" . $myrow["SalesAccountName"]);
        label_cell($myrow["purchasing_gl_code"] . "&nbsp;" . $myrow["PurchasingAccountName"]);
 
+       inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_types', 'id');
        edit_button_cell("Edit".$myrow["id"], _("Edit"));
        delete_button_cell("Delete".$myrow["id"], _("Delete"));
 
        end_row();
 }
 
-end_table();
-
-end_form();
-echo '<br>';
-
+inactive_control_row($th);
+end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1) 
@@ -158,7 +166,7 @@ gl_all_accounts_list_row(_("Purchasing GL Account:"), 'purchasing_gl_code', null
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();