projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes form main trunk up to 2.2.4
[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 b4ca18665f55ce9ea2d70438c53a0c7292333228..57ab4a65730ca161b8a1462ed5d20962dcc84d4c 100644
(file)
--- a/
gl/manage/gl_account_types.php
+++ b/
gl/manage/gl_account_types.php
@@
-13,7
+13,7
@@
$page_security = 'SA_GLACCOUNTGROUP';
$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
-page(_("GL Account Groups"));
+page(_(
$help_context =
"GL Account Groups"));
include($path_to_root . "/gl/includes/gl_db.inc");
include($path_to_root . "/gl/includes/gl_db.inc");
@@
-77,21
+77,15
@@
function can_delete($selected_id)
{
if ($selected_id == -1)
return false;
{
if ($selected_id == -1)
return false;
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master
- WHERE account_type=$selected_id";
- $result = db_query($sql, "could not query chart master");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
+ $type = db_escape($selected_id);
+
+ if (key_in_foreign_table($type, 'chart_master', 'account_type', true))
{
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;
}
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types
- WHERE parent=$selected_id";
- $result = db_query($sql, "could not query chart types");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
+ if (key_in_foreign_table($type, 'chart_types', 'parent', true))
{
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;
@@
-109,7
+103,7
@@
if ($Mode == 'Delete')
if (can_delete($selected_id))
{
delete_account_type($selected_id);
if (can_delete($selected_id))
{
delete_account_type($selected_id);
- display_notification(_('Selected
currency
has been deleted'));
+ display_notification(_('Selected
account group
has been deleted'));
}
$Mode = 'RESET';
}
}
$Mode = 'RESET';
}
@@
-180,7
+174,7
@@
if ($selected_id != -1)
label_row(_("ID:"), $_POST['id']);
}
else
label_row(_("ID:"), $_POST['id']);
}
else
- text_row_ex(_("ID:"), 'id',
4
);
+ text_row_ex(_("ID:"), 'id',
10
);
text_row_ex(_("Name:"), 'name', 50);
gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);
text_row_ex(_("Name:"), 'name', 50);
gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);