X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=taxes%2Ftax_groups.php;h=16873e04ecf2724e849795ea1a2ef1a522827365;hb=c061e1b478cb41d22c23627ddff39a4ea7d849ed;hp=2f300e7ee71b2377a199391f8c57be2634ee4a03;hpb=7732e889ec468099f6b66173b8dd6363e0a30ed8;p=fa-stable.git
diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 2f300e7e..16873e04 100644
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -40,53 +40,31 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
display_error(_("The tax group name cannot be empty."));
set_focus('name');
}
- /* Editable rate has been removed 090920 Joe Hunt
- else
- {
- // make sure any entered rates are valid
- for ($i = 0; $i < 5; $i++)
- {
- if (isset($_POST['tax_type_id' . $i]) &&
- $_POST['tax_type_id' . $i] != ALL_NUMERIC &&
- !check_num('rate' . $i, 0))
- {
- display_error( _("An entered tax rate is invalid or less than zero."));
- $input_error = 1;
- set_focus('rate');
- break;
- }
- }
- }
- */
if ($input_error != 1)
{
// create an array of the taxes and array of rates
$taxes = array();
- $rates = array();
$tax_shippings = array();
- for ($i = 0; $i < 5; $i++)
- {
- if (isset($_POST['tax_type_id' . $i]) &&
- $_POST['tax_type_id' . $i] != ANY_NUMERIC)
- {
- $taxes[] = $_POST['tax_type_id' . $i];
- $rates[] = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
- $tax_shippings[] = check_value('tax_shipping' . $i);
- //Editable rate has been removed 090920 Joe Hunt
- //$rates[] = input_num('rate' . $i);
- }
- }
-
+ while (($id = find_submit('tax_type_id'))!=-1)
+ {
+ 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, $rates, $tax_shippings);
+ update_tax_group($selected_id, $_POST['name'], $taxes, $tax_shippings);
display_notification(_('Selected tax group has been updated'));
}
else
{
- add_tax_group($_POST['name'], $taxes, $rates, $tax_shippings);
+ add_tax_group($_POST['name'], $taxes, $tax_shippings);
display_notification(_('New tax group has been added'));
}
@@ -135,7 +113,8 @@ if ($Mode == 'RESET')
$selected_id = -1;
$sav = get_post('show_inactive');
unset($_POST);
- $_POST['show_inactive'] = $sav;
+ if ($sav)
+ $_POST['show_inactive'] = $sav;
}
//-----------------------------------------------------------------------------------
@@ -157,14 +136,10 @@ while ($myrow = db_fetch($result))
label_cell($myrow["name"]);
- /*for ($i=0; $i< 5; $i++)
- if ($myrow["type" . $i] != ALL_NUMERIC)
- echo "
" . $myrow["type" . $i] . " | ";*/
-
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);
@@ -183,20 +158,9 @@ if ($selected_id != -1)
$_POST['name'] = $group["name"];
- $items = get_tax_group_items($selected_id);
-
- $i = 0;
- while ($tax_item = db_fetch($items))
- {
- $_POST['tax_type_id' . $i] = $tax_item["tax_type_id"];
- $_POST['rate' . $i] = percent_format($tax_item["rate"]);
- $_POST['tax_shipping' . $i] = $tax_item["tax_shipping"];
- $i ++;
- }
- while($i<5) unset($_POST['tax_type_id'.$i++]);
}
-
hidden('selected_id', $selected_id);
+
}
text_row_ex(_("Description:"), 'name', 40);
@@ -204,33 +168,36 @@ end_table();
display_note(_("Select the taxes that are included in this group."), 1, 1);
+$items = get_tax_group_rates($selected_id!=-1 ? $selected_id : null);
+
start_table(TABLESTYLE2);
-//$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
-//Editable rate has been removed 090920 Joe Hunt
-$th = array(_("Tax"), _("Rate (%)"), _("Shipping Tax"));
+$th = array(_("Tax"), "", _("Shipping Tax"));
table_header($th);
-for ($i = 0; $i < 5; $i++)
+
+while($item = db_fetch($items))
{
start_row();
- if (!isset($_POST['tax_type_id' . $i]))
- $_POST['tax_type_id' . $i] = 0;
- if (!isset($_POST['tax_shipping' . $i]))
- $_POST['tax_shipping' . $i] = 0;
- tax_types_list_cells(null, 'tax_type_id' . $i, $_POST['tax_type_id' . $i], _("None"), true);
-
- if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != ALL_NUMERIC)
+ if ($selected_id != -1)
{
- $default_rate = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
- label_cell(percent_format($default_rate), "nowrap align=right");
-
- check_cells(null, 'tax_shipping' . $i);
- //Editable rate has been removed 090920 Joe Hunt
- //if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "")
- // $_POST['rate' . $i] = percent_format($default_rate);
- //small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i], null, null,
- // user_percent_dec());
+ check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'],
+ isset($item['rate']), true, false, "align='center'");
+ if (isset($item['rate']))
+ check_cells(null, 'tax_shipping' . $item['tax_type_id'], $item['tax_shipping']);
}
- end_row();
+ else
+ {
+ check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'],
+ null, true, false, "align='center'");
+ if (get_post('_tax_type_id' . $item['tax_type_id'].'_update'))
+ {
+ //$_POST['_tax_type_id' . $item['tax_type_id'].'_update'] = 0;
+ $Ajax->activate('_page_body');
+ }
+ if (check_value('tax_type_id' . $item['tax_type_id'])==1)
+ check_cells(null, 'tax_shipping' . $item['tax_type_id'], null);
+ }
+ end_row();
+
}
end_table(1);
@@ -243,4 +210,3 @@ end_form();
end_page();
-?>