projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid running same query multiple times. Rep307.php. Fixed
[fa-stable.git]
/
gl
/
manage
/
gl_account_classes.php
diff --git
a/gl/manage/gl_account_classes.php
b/gl/manage/gl_account_classes.php
index fc617c079813ddd8b46e774364b697d8aa72fd6e..a08a17e4652e40bdc22a97819daec91f6afaec68 100644
(file)
--- a/
gl/manage/gl_account_classes.php
+++ b/
gl/manage/gl_account_classes.php
@@
-19,25
+19,26
@@
include($path_to_root . "/gl/includes/gl_db.inc");
include($path_to_root . "/includes/ui.inc");
include($path_to_root . "/includes/ui.inc");
-simple_page_mode(
tru
e);
+simple_page_mode(
fals
e);
//-----------------------------------------------------------------------------------
function can_process()
{
//-----------------------------------------------------------------------------------
function can_process()
{
- global $use_oldstyle_convert;
- if (!is_numeric($_POST['id']))
+ global $SysPrefs;
+
+ if (strlen(trim($_POST['id'])) == 0)
{
{
- display_error( _("The account class ID
must be numeric
."));
+ display_error( _("The account class ID
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 class name cannot be empty."));
set_focus('name');
return false;
}
{
display_error( _("The account class name cannot be empty."));
set_focus('name');
return false;
}
- if (isset($
use_oldstyle_convert) && $
use_oldstyle_convert == 1)
+ if (isset($
SysPrefs->use_oldstyle_convert) && $SysPrefs->
use_oldstyle_convert == 1)
$_POST['Balance'] = check_value('Balance');
return true;
}
$_POST['Balance'] = check_value('Balance');
return true;
}
@@
-50,7
+51,7
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
if (can_process())
{
if (can_process())
{
- if ($selected_id !=
-1
)
+ if ($selected_id !=
""
)
{
if(update_account_class($selected_id, $_POST['name'], $_POST['ctype']))
display_notification(_('Selected account class settings has been updated'));
{
if(update_account_class($selected_id, $_POST['name'], $_POST['ctype']))
display_notification(_('Selected account class settings has been updated'));
@@
-69,7
+70,7
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
function can_delete($selected_id)
{
function can_delete($selected_id)
{
- if ($selected_id ==
-1
)
+ if ($selected_id ==
""
)
return false;
if (key_in_foreign_table($selected_id, 'chart_types', 'class_id'))
{
return false;
if (key_in_foreign_table($selected_id, 'chart_types', 'class_id'))
{
@@
-97,7
+98,7
@@
if ($Mode == 'Delete')
//-----------------------------------------------------------------------------------
if ($Mode == 'RESET')
{
//-----------------------------------------------------------------------------------
if ($Mode == 'RESET')
{
- $selected_id =
-1
;
+ $selected_id =
""
;
$_POST['id'] = $_POST['name'] = $_POST['ctype'] = '';
}
//-----------------------------------------------------------------------------------
$_POST['id'] = $_POST['name'] = $_POST['ctype'] = '';
}
//-----------------------------------------------------------------------------------
@@
-105,9
+106,9
@@
if ($Mode == 'RESET')
$result = get_account_classes(check_value('show_inactive'));
start_form();
$result = get_account_classes(check_value('show_inactive'));
start_form();
-start_table(
$table_style
);
+start_table(
TABLESTYLE
);
$th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
$th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
-if (isset($
use_oldstyle_convert) && $
use_oldstyle_convert == 1)
+if (isset($
SysPrefs->use_oldstyle_convert) && $SysPrefs->
use_oldstyle_convert == 1)
$th[2] = _("Balance Sheet");
inactive_control_column($th);
table_header($th);
$th[2] = _("Balance Sheet");
inactive_control_column($th);
table_header($th);
@@
-115,12
+116,11
@@
table_header($th);
$k = 0;
while ($myrow = db_fetch($result))
{
$k = 0;
while ($myrow = db_fetch($result))
{
-
alt_table_row_color($k);
label_cell($myrow["cid"]);
alt_table_row_color($k);
label_cell($myrow["cid"]);
- label_cell(
$myrow['class_name']
);
- if (isset($
use_oldstyle_convert) && $
use_oldstyle_convert == 1)
+ label_cell(
'<a href="./gl_account_types.php?cid='.$myrow["cid"].'">'.$myrow['class_name'].'</a>'
);
+ if (isset($
SysPrefs->use_oldstyle_convert) && $SysPrefs->
use_oldstyle_convert == 1)
{
$myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No")));
{
$myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No")));
@@
-136,9
+136,9
@@
inactive_control_row($th);
end_table(1);
//-----------------------------------------------------------------------------------
end_table(1);
//-----------------------------------------------------------------------------------
-start_table(
$table_style
2);
+start_table(
TABLESTYLE
2);
-if ($selected_id !=
-1
)
+if ($selected_id !=
""
)
{
if ($Mode == 'Edit') {
//editing an existing status code
{
if ($Mode == 'Edit') {
//editing an existing status code
@@
-146,7
+146,7
@@
if ($selected_id != -1)
$_POST['id'] = $myrow["cid"];
$_POST['name'] = $myrow["class_name"];
$_POST['id'] = $myrow["cid"];
$_POST['name'] = $myrow["class_name"];
- if (isset($
use_oldstyle_convert) && $
use_oldstyle_convert == 1)
+ if (isset($
SysPrefs->use_oldstyle_convert) && $SysPrefs->
use_oldstyle_convert == 1)
$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
else
$_POST['ctype'] = $myrow["ctype"];
$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
else
$_POST['ctype'] = $myrow["ctype"];
@@
-164,14
+164,14
@@
else
text_row_ex(_("Class Name:"), 'name', 50, 60);
text_row_ex(_("Class Name:"), 'name', 50, 60);
-if (isset($
use_oldstyle_convert) && $
use_oldstyle_convert == 1)
+if (isset($
SysPrefs->use_oldstyle_convert) && $SysPrefs->
use_oldstyle_convert == 1)
check_row(_("Balance Sheet"), 'ctype', null);
else
class_types_list_row(_("Class Type:"), 'ctype', null);
end_table(1);
check_row(_("Balance Sheet"), 'ctype', null);
else
class_types_list_row(_("Class Type:"), 'ctype', null);
end_table(1);
-submit_add_or_update_center($selected_id ==
-1
, '', 'both');
+submit_add_or_update_center($selected_id ==
""
, '', 'both');
end_form();
end_form();
@@
-179,4
+179,3
@@
end_form();
end_page();
end_page();
-?>