Fied buggy exemptions display in item tax editor.

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

diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php
index 96742971e44d2ac84a0c66c8de886cc1199a42d5..43fa12145183a2150eb01e854fc61e75f708c0a1 100644 (file)
--- a/taxes/item_tax_types.php
+++ b/taxes/item_tax_types.php
@@ -9,12 +9,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+$page_security = 'SA_ITEMTAXTYPE';
 $path_to_root = "..";
-$page_security = 3;
 
 include($path_to_root . "/includes/session.inc");
 
-page(_("Item Tax Types")); 
+page(_($help_context = "Item Tax Types")); 
 
 include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 include_once($path_to_root . "/taxes/db/tax_types_db.inc");
@@ -101,16 +101,19 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
+       $sav = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $sav;
 }
 //-----------------------------------------------------------------------------------
 
 
-$result2 = $result = get_all_item_tax_types();
+$result2 = $result = get_all_item_tax_types(check_value('show_inactive'));
+
 start_form();
 start_table("$table_style width=30%");
 $th = array(_("Name"), _("Tax exempt"),'','');
-
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -130,26 +133,23 @@ while ($myrow = db_fetch($result2))
        
        label_cell($myrow["name"]);
        label_cell($disallow_text);
+       inactive_control_cell($myrow["id"], $myrow["inactive"], 'item_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) 
 {
        if ($Mode == 'Edit') {
                $myrow = get_item_tax_type($selected_id);
-    
+               unset($_POST); // clear exemption checkboxes
                $_POST['name']  = $myrow["name"];
                $_POST['exempt']  = $myrow["exempt"];
        
@@ -199,7 +199,7 @@ if (!isset($_POST['exempt']) || $_POST['exempt'] == 0)
     end_table(1);
 }
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();