X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=07cda24372a2bc9fe4ae5f496c19d406c18e4643;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=c633c556de77bd6be2b1bc9ae666803bce03fb39;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index c633c556..07cda243 100644
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -40,13 +40,14 @@ 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] != reserved_words::get_all_numeric() &&
+ $_POST['tax_type_id' . $i] != ALL_NUMERIC &&
!check_num('rate' . $i, 0))
{
display_error( _("An entered tax rate is invalid or less than zero."));
@@ -56,7 +57,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
}
}
}
-
+ */
if ($input_error != 1)
{
@@ -67,10 +68,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
for ($i = 0; $i < 5; $i++)
{
if (isset($_POST['tax_type_id' . $i]) &&
- $_POST['tax_type_id' . $i] != reserved_words::get_any_numeric())
+ $_POST['tax_type_id' . $i] != ANY_NUMERIC)
{
$taxes[] = $_POST['tax_type_id' . $i];
- $rates[] = input_num('rate' . $i);
+ $rates[] = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
+ //Editable rate has been removed 090920 Joe Hunt
+ //$rates[] = input_num('rate' . $i);
}
}
@@ -162,7 +165,7 @@ while ($myrow = db_fetch($result))
label_cell(_("No"));
/*for ($i=0; $i< 5; $i++)
- if ($myrow["type" . $i] != reserved_words::get_all_numeric())
+ if ($myrow["type" . $i] != ALL_NUMERIC)
echo "
" . $myrow["type" . $i] . " | ";*/
inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
@@ -173,6 +176,7 @@ while ($myrow = db_fetch($result))
inactive_control_row($th);
end_table(1);
+
//-----------------------------------------------------------------------------------
start_table($table_style2);
@@ -196,6 +200,7 @@ if ($selected_id != -1)
$_POST['rate' . $i] = percent_format($tax_item["rate"]);
$i ++;
}
+ while($i<5) unset($_POST['tax_type_id'.$i++]);
}
hidden('selected_id', $selected_id);
@@ -208,7 +213,9 @@ end_table();
display_note(_("Select the taxes that are included in this group."), 1);
start_table($table_style2);
-$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
+//$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
+//Editable rate has been removed 090920 Joe Hunt
+$th = array(_("Tax"), _("Rate (%)"));
table_header($th);
for ($i = 0; $i < 5; $i++)
{
@@ -217,16 +224,16 @@ for ($i = 0; $i < 5; $i++)
$_POST['tax_type_id' . $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] != reserved_words::get_all_numeric())
+ if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != ALL_NUMERIC)
{
-
$default_rate = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
label_cell(percent_format($default_rate), "nowrap align=right");
- 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());
+ //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());
}
end_row();
}