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 up to version 2.3.4 into unstable.
[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 3cef7a07540acdc4e051ae30c8c8665eae737ae3..b3e56aca8b1a82e0df8f46191bb709986f37fbd7 100644
(file)
--- a/
gl/manage/gl_account_types.php
+++ b/
gl/manage/gl_account_types.php
@@
-22,7
+22,7
@@
include($path_to_root . "/includes/ui.inc");
simple_page_mode(false);
//-----------------------------------------------------------------------------------
simple_page_mode(false);
//-----------------------------------------------------------------------------------
-function can_process()
+function can_process(
$selected_id
)
{
if (strlen(trim($_POST['id'])) == 0)
{
{
if (strlen(trim($_POST['id'])) == 0)
{
@@
-36,6
+36,13
@@
function can_process()
set_focus('name');
return false;
}
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'])
//if (strcmp($_POST['id'], $_POST['parent']) == 0)
if ($_POST['id'] === $_POST['parent'])
@@
-52,7
+59,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 != "")