projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed After successful Backup, loader.gif still present
[fa-stable.git]
/
gl
/
manage
/
gl_account_types.php
diff --git
a/gl/manage/gl_account_types.php
b/gl/manage/gl_account_types.php
index 7cc32aa44f835b5b5113864f288895f35a05ad8a..0a1791bc97efd5d18ef09d24c2a9202c9772243e 100644
(file)
--- a/
gl/manage/gl_account_types.php
+++ b/
gl/manage/gl_account_types.php
@@
-22,22
+22,28
@@
include($path_to_root . "/includes/ui.inc");
simple_page_mode(false);
//-----------------------------------------------------------------------------------
simple_page_mode(false);
//-----------------------------------------------------------------------------------
-function can_process()
+function can_process(
$selected_id
)
{
{
- if (
$_POST['id'] == "")
+ if (
strlen(trim($_POST['id'])) == 0)
{
display_error( _("The account group id cannot be empty."));
set_focus('id');
return false;
}
{
display_error( _("The account group id cannot be empty."));
set_focus('id');
return false;
}
- if (strlen(
$_POST['name']
) == 0)
+ if (strlen(
trim($_POST['name'])
) == 0)
{
display_error( _("The account group name cannot be empty."));
set_focus('name');
return false;
}
{
display_error( _("The account group name cannot be empty."));
set_focus('name');
return false;
}
+ $type = get_account_type(trim($_POST['id']));
+ if ($type && ($type['id'] != $selected_id))
+ {
+ display_error( _("This account group id is already in use."));
+ set_focus('id');
+ return false;
+ }
- //if (strcmp($_POST['id'], $_POST['parent']) == 0)
if ($_POST['id'] === $_POST['parent'])
{
display_error(_("You cannot set an account group to be a subgroup of itself."));
if ($_POST['id'] === $_POST['parent'])
{
display_error(_("You cannot set an account group to be a subgroup of itself."));
@@
-52,7
+58,7
@@
function can_process()
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
- if (can_process())
+ if (can_process(
$selected_id
))
{
if ($selected_id != "")
{
if ($selected_id != "")
@@
-72,19
+78,18
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-function can_delete($
selected_id
)
+function can_delete($
type
)
{
{
- if ($
selected_id
== "")
+ if ($
type
== "")
return false;
return false;
- $type = db_escape($selected_id);
- if (key_in_foreign_table($type, 'chart_master', 'account_type'
, true
))
+ if (key_in_foreign_table($type, 'chart_master', 'account_type'))
{
display_error(_("Cannot delete this account group because GL accounts have been created referring to it."));
return false;
}
{
display_error(_("Cannot delete this account group because GL accounts have been created referring to it."));
return false;
}
- if (key_in_foreign_table($type, 'chart_types', 'parent'
, true
))
+ if (key_in_foreign_table($type, 'chart_types', 'parent'))
{
display_error(_("Cannot delete this account group because GL account groups have been created referring to it."));
return false;
{
display_error(_("Cannot delete this account group because GL account groups have been created referring to it."));
return false;
@@
-118,8
+123,8
@@
if ($Mode == 'RESET')
$result = get_account_types(check_value('show_inactive'));
start_form();
$result = get_account_types(check_value('show_inactive'));
start_form();
-start_table(
$table_style
);
-$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class
Type
"), "", "");
+start_table(
TABLESTYLE
);
+$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class"), "", "");
inactive_control_column($th);
table_header($th);
inactive_control_column($th);
table_header($th);
@@
-154,7
+159,7
@@
inactive_control_row($th);
end_table(1);
//-----------------------------------------------------------------------------------
end_table(1);
//-----------------------------------------------------------------------------------
-start_table(
$table_style
2);
+start_table(
TABLESTYLE
2);
if ($selected_id != "")
{
if ($selected_id != "")
{
@@
-183,7
+188,7
@@
text_row_ex(_("Name:"), 'name', 50);
gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);
gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);
-class_list_row(_("Class
Type
:"), 'class_id', null);
+class_list_row(_("Class:"), 'class_id', null);
end_table(1);
end_table(1);
@@
-195,4
+200,3
@@
end_form();
end_page();
end_page();
-?>