Removed finally unimplemented freight cost field in Purchasing.

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

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 4e138991efbca8f4bed509f0e1a442a93b08e58a..451c344aaecc4894ab4917fe57d0a598560ffea1 100644 (file)
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -49,19 +49,22 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
                while (($id = find_submit('tax_type_id'))!=-1)
                {
-                       $taxes[] = $id;
-                       $tax_shippings[] = check_value('tax_shipping'.$id);
+                       if (check_value('tax_type_id'.$id) != 0)
+                       {
+                               $taxes[] = $id;
+                               $tax_shippings[] = check_value('tax_shipping'.$id);
+                       }       
                        unset($_POST['tax_type_id' . $id]);
                        unset($_POST['tax_shipping' . $id]);
                }
        if ($selected_id != -1) 
        {
-                       update_tax_group($selected_id, $_POST['name'], $taxes, $tax_shippings);
+                       update_tax_group($selected_id, $_POST['name'], $taxes, $tax_shippings, get_post('tax_area'));
                        display_notification(_('Selected tax group has been updated'));
        } 
        else 
        {
-                       add_tax_group($_POST['name'], $taxes, $tax_shippings);
+                       add_tax_group($_POST['name'], $taxes, $tax_shippings, get_post('tax_area'));
                        display_notification(_('New tax group has been added'));
        }
 
@@ -120,7 +123,7 @@ $result = get_all_tax_groups(check_value('show_inactive'));
 start_form();
 
 start_table(TABLESTYLE);
-$th = array(_("Description"), "", "");
+$th = array(_("Description"), _("Tax Area Type"), "", "");
 inactive_control_column($th);
 
 table_header($th);
@@ -132,11 +135,12 @@ while ($myrow = db_fetch($result))
        alt_table_row_color($k);
 
        label_cell($myrow["name"]);
+       label_cell($tax_area_types[$myrow['tax_area']]);
 
        inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
        edit_button_cell("Edit".$myrow["id"], _("Edit"));
        delete_button_cell("Delete".$myrow["id"], _("Delete"));
-       end_row();;
+       end_row();
 }
 
 inactive_control_row($th);
@@ -154,12 +158,14 @@ if ($selected_id != -1)
        $group = get_tax_group($selected_id);
 
        $_POST['name']  = $group["name"];
+       $_POST['tax_area']  = $group["tax_area"];
 
        }
        hidden('selected_id', $selected_id);
 
 }
 text_row_ex(_("Description:"), 'name', 40);
+vat_areas_list_row(_("Tax Area Type:"), 'tax_area');
 
 end_table();
 
@@ -207,4 +213,3 @@ end_form();
 
 end_page();
 
-?>