projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.3.25.
[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 b152e2cbabfe00f798e97d1ae9b5144f150193c5..a906f3e8b1c62a0c574f65f854d8ae24148b5ce9 100644
(file)
--- a/
gl/manage/gl_account_types.php
+++ b/
gl/manage/gl_account_types.php
@@
-9,37
+9,43
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
3
;
-$path_to_root
=
"../..";
+$page_security =
'SA_GLACCOUNTGROUP'
;
+$path_to_root
=
"../..";
include($path_to_root . "/includes/session.inc");
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 . "/includes/ui.inc");
include($path_to_root . "/gl/includes/gl_db.inc");
include($path_to_root . "/includes/ui.inc");
-simple_page_mode(
tru
e);
+simple_page_mode(
fals
e);
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-function can_process()
+function can_process(
$selected_id
)
{
{
- global $selected_id;
-
- if (!input_num('id'))
+ if (strlen(trim($_POST['id'])) == 0)
{
{
- display_error( _("The account
id must be an integer an
d cannot be empty."));
+ display_error( _("The account
group i
d cannot be empty."));
set_focus('id');
return false;
}
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 (isset($selected_id) && ($selected_id == $_POST['parent']))
+ //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."));
return false;
{
display_error(_("You cannot set an account group to be a subgroup of itself."));
return false;
@@
-53,18
+59,19
@@
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 !=
-1
)
+ if ($selected_id !=
""
)
{
{
- update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']);
- display_notification(_('Selected account type has been updated'));
+ if (update_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'], $_POST['old_id']))
+
display_notification(_('Selected account type has been updated'));
}
else
{
}
else
{
- add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent']);
- display_notification(_('New account type has been added'));
+ if (add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'])) {
+ display_notification(_('New account type has been added'));
+ }
}
$Mode = 'RESET';
}
}
$Mode = 'RESET';
}
@@
-72,25
+79,18
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-function can_delete($
selected_id
)
+function can_delete($
type
)
{
{
- if ($
selected_id == -1
)
+ if ($
type == ""
)
return false;
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)
+
+ 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;
}
- $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'))
{
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;
@@
-108,23
+108,25
@@
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';
}
if ($Mode == 'RESET')
{
}
$Mode = 'RESET';
}
if ($Mode == 'RESET')
{
- $selected_id =
-1
;
+ $selected_id =
""
;
$_POST['id'] = $_POST['name'] = '';
unset($_POST['parent']);
unset($_POST['class_id']);
}
//-----------------------------------------------------------------------------------
$_POST['id'] = $_POST['name'] = '';
unset($_POST['parent']);
unset($_POST['class_id']);
}
//-----------------------------------------------------------------------------------
-$result = get_account_types();
+$result = get_account_types(check_value('show_inactive'));
+
start_form();
start_form();
-start_table($table_style);
-$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Name"), "", "");
+start_table(TABLESTYLE);
+$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class"), "", "");
+inactive_control_column($th);
table_header($th);
$k = 0;
table_header($th);
$k = 0;
@@
-135,7
+137,7
@@
while ($myrow = db_fetch($result))
$bs_text = get_account_class_name($myrow["class_id"]);
$bs_text = get_account_class_name($myrow["class_id"]);
- if ($myrow["parent"] ==
reserved_words::get_any_numeric()
)
+ if ($myrow["parent"] ==
'-1'
)
{
$parent_text = "";
}
{
$parent_text = "";
}
@@
-148,21
+150,19
@@
while ($myrow = db_fetch($result))
label_cell($myrow["name"]);
label_cell($parent_text);
label_cell($bs_text);
label_cell($myrow["name"]);
label_cell($parent_text);
label_cell($bs_text);
+ inactive_control_cell($myrow["id"], $myrow["inactive"], 'chart_types', 'id');
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
end_row();
}
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
end_row();
}
-end_table();
-end_form();
-echo '<br>';
+inactive_control_row($th);
+end_table(1);
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-start_form();
-
-start_table($table_style2);
+start_table(TABLESTYLE2);
-if ($selected_id !=
-1
)
+if ($selected_id !=
""
)
{
if ($Mode == 'Edit')
{
{
if ($Mode == 'Edit')
{
@@
-172,23
+172,28
@@
if ($selected_id != -1)
$_POST['id'] = $myrow["id"];
$_POST['name'] = $myrow["name"];
$_POST['parent'] = $myrow["parent"];
$_POST['id'] = $myrow["id"];
$_POST['name'] = $myrow["name"];
$_POST['parent'] = $myrow["parent"];
+ if ($_POST['parent'] == '-1')
+ $_POST['parent'] == "";
$_POST['class_id'] = $myrow["class_id"];
$_POST['class_id'] = $myrow["class_id"];
- hidden('selected_id', $selected_id);
+ hidden('selected_id', $myrow['id']);
+ hidden('old_id', $myrow["id"]);
}
}
- hidden('id');
- label_row(_("ID:"), $_POST['id']);
+ else
+ {
+ hidden('selected_id', $selected_id);
+ hidden('old_id', $_POST["old_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);
-class_list_row(_("Class
Name
:"), 'class_id', null);
+class_list_row(_("Class:"), 'class_id', null);
end_table(1);
end_table(1);
-submit_add_or_update_center($selected_id ==
-1, '', true
);
+submit_add_or_update_center($selected_id ==
"", '', 'both'
);
end_form();
end_form();