projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0000071] Ordering from customer on hold was possible after double
[fa-stable.git]
/
taxes
/
tax_types.php
diff --git
a/taxes/tax_types.php
b/taxes/tax_types.php
index d5b5e60bcedbb53fd645dc99785745825102527f..adfa7b9df70ea0797cb1fdde45fddb3969e7e614 100644
(file)
--- a/
taxes/tax_types.php
+++ b/
taxes/tax_types.php
@@
-3,37
+3,26
@@
$page_security = 3;
$path_to_root="..";
include($path_to_root . "/includes/session.inc");
$path_to_root="..";
include($path_to_root . "/includes/session.inc");
-
page(_("Tax Types"));
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/taxes/db/tax_types_db.inc");
page(_("Tax Types"));
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/taxes/db/tax_types_db.inc");
-if (isset($_GET['selected_id']))
-{
- $selected_id = $_GET['selected_id'];
-}
-elseif(isset($_POST['selected_id']))
-{
- $selected_id = $_POST['selected_id'];
-}
+simple_page_mode(true);
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-function can_process()
+function can_process()
{
{
- if (strlen($_POST['name']) == 0)
+ if (strlen($_POST['name']) == 0)
{
display_error(_("The tax type name cannot be empty."));
{
display_error(_("The tax type name cannot be empty."));
+ set_focus('name');
return false;
return false;
- }
- elseif (!is_numeric($_POST['rate']))
- {
- display_error( _("The default tax rate must be numeric."));
- return false;
- }
- elseif ($_POST['rate'] < 0)
+ }
+ elseif (!check_num('rate', 0))
{
{
- display_error( _("The default tax rate cannot be less than zero."));
+ display_error( _("The default tax rate must be numeric and not less than zero."));
+ set_focus('rate');
return false;
}
return false;
}
@@
-42,22
+31,24
@@
function can_process()
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-if (
isset($_POST['ADD_ITEM']) && can_process())
+if (
$Mode=='ADD_ITEM' && can_process())
{
add_tax_type($_POST['name'], $_POST['sales_gl_code'],
{
add_tax_type($_POST['name'], $_POST['sales_gl_code'],
- $_POST['purchasing_gl_code'], $_POST['rate'], check_value('out'));
- meta_forward($_SERVER['PHP_SELF']);
+ $_POST['purchasing_gl_code'], input_num('rate'));
+ display_notification(_('New tax type has been added'));
+ $Mode = 'RESET';
}
//-----------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------
-if (
isset($_POST['UPDATE_ITEM']) && can_process())
+if (
$Mode=='UPDATE_ITEM' && can_process())
{
update_tax_type($selected_id, $_POST['name'],
{
update_tax_type($selected_id, $_POST['name'],
- $_POST['sales_gl_code'], $_POST['purchasing_gl_code'], $_POST['rate'], check_value('out'));
- meta_forward($_SERVER['PHP_SELF']);
+ $_POST['sales_gl_code'], $_POST['purchasing_gl_code'], input_num('rate'));
+ display_notification(_('Selected tax type has been updated'));
+ $Mode = 'RESET';
}
//-----------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------
@@
-67,9
+58,10
@@
function can_delete($selected_id)
$sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_group_items WHERE tax_type_id=$selected_id";
$result = db_query($sql, "could not query tax groups");
$myrow = db_fetch_row($result);
$sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_group_items WHERE tax_type_id=$selected_id";
$result = db_query($sql, "could not query tax groups");
$myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
+ if ($myrow[0] > 0)
{
display_error(_("Cannot delete this tax type because tax groups been created referring to it."));
{
display_error(_("Cannot delete this tax type because tax groups been created referring to it."));
+
return false;
}
return false;
}
@@
-79,52
+71,54
@@
function can_delete($selected_id)
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-if (
isset($_GET['delete']))
+if (
$Mode == 'Delete')
{
if (can_delete($selected_id))
{
delete_tax_type($selected_id);
{
if (can_delete($selected_id))
{
delete_tax_type($selected_id);
-
meta_forward($_SERVER['PHP_SELF']
);
+
display_notification(_('Selected tax type has been deleted')
);
}
}
+ $Mode = 'RESET';
}
}
+if ($Mode == 'RESET')
+{
+ $selected_id = -1;
+ unset($_POST);
+}
//-----------------------------------------------------------------------------------
$result = get_all_tax_types();
//-----------------------------------------------------------------------------------
$result = get_all_tax_types();
+start_form();
start_table($table_style);
$th = array(_("Description"), _("Default Rate (%)"),
start_table($table_style);
$th = array(_("Description"), _("Default Rate (%)"),
- _("Sales GL Account"), _("Purchasing GL Account"),
_("Outstanding"),
"", "");
-table_header($th);
+ _("Sales GL Account"), _("Purchasing GL Account"), "", "");
+table_header($th);
$k = 0;
$k = 0;
-while ($myrow = db_fetch($result))
+while ($myrow = db_fetch($result))
{
{
- if ($myrow['out'] == 1)
- $out = _("Yes");
- else
- $out = _("No");
alt_table_row_color($k);
label_cell($myrow["name"]);
alt_table_row_color($k);
label_cell($myrow["name"]);
- label_cell(
number_format2($myrow["rate"],user_percent_dec()
), "align=right");
+ label_cell(
percent_format($myrow["rate"]
), "align=right");
label_cell($myrow["sales_gl_code"] . " " . $myrow["SalesAccountName"]);
label_cell($myrow["purchasing_gl_code"] . " " . $myrow["PurchasingAccountName"]);
label_cell($myrow["sales_gl_code"] . " " . $myrow["SalesAccountName"]);
label_cell($myrow["purchasing_gl_code"] . " " . $myrow["PurchasingAccountName"]);
- label_cell($out);
- edit_link_cell("selected_id=".$myrow["id"]);
- delete_link_cell("selected_id=".$myrow["id"]."&delete=1");
+ edit_button_cell("Edit".$myrow["id"], _("Edit"));
+ edit_button_cell("Delete".$myrow["id"], _("Delete"));
+
end_row();
}
end_table();
end_row();
}
end_table();
-//-----------------------------------------------------------------------------------
-
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Tax Type"));
+end_form();
+echo '<br>';
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
@@
-132,31
+126,29
@@
start_form();
start_table($table_style2);
start_table($table_style2);
-if (
isset($selected_id)
)
+if (
$selected_id != -1
)
{
{
- //editing an existing status code
-
- $myrow = get_tax_type($selected_id);
+ if ($Mode == 'Edit') {
+ //editing an existing status code
- $_POST['name'] = $myrow["name"];
- $_POST['rate'] = $myrow["rate"];
- $_POST['sales_gl_code'] = $myrow["sales_gl_code"];
- $_POST['purchasing_gl_code'] = $myrow["purchasing_gl_code"];
- $_POST['out'] = $myrow["out"];
+ $myrow = get_tax_type($selected_id);
+ $_POST['name'] = $myrow["name"];
+ $_POST['rate'] = percent_format($myrow["rate"]);
+ $_POST['sales_gl_code'] = $myrow["sales_gl_code"];
+ $_POST['purchasing_gl_code'] = $myrow["purchasing_gl_code"];
+ }
hidden('selected_id', $selected_id);
}
text_row_ex(_("Description:"), 'name', 50);
hidden('selected_id', $selected_id);
}
text_row_ex(_("Description:"), 'name', 50);
-
text_row_ex(_("Default Rate:"), 'rate', 10, 10, "", "%"
);
+
small_amount_row(_("Default Rate:"), 'rate', '', "", "%", user_percent_dec()
);
gl_all_accounts_list_row(_("Sales GL Account:"), 'sales_gl_code', null);
gl_all_accounts_list_row(_("Purchasing GL Account:"), 'purchasing_gl_code', null);
gl_all_accounts_list_row(_("Sales GL Account:"), 'sales_gl_code', null);
gl_all_accounts_list_row(_("Purchasing GL Account:"), 'purchasing_gl_code', null);
-check_row(_("Outstanding:"), 'out', null);
-
end_table(1);
end_table(1);
-submit_add_or_update_center(
!isset($selected_id)
);
+submit_add_or_update_center(
$selected_id == -1, '', true
);
end_form();
end_form();