X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fmanage%2Fgl_account_classes.php;h=a08a17e4652e40bdc22a97819daec91f6afaec68;hb=274bad27be5e62c7cbed49b22d66270991044009;hp=8de53227e5da3b4463dd2a0c7cf208e8f9b8cfaf;hpb=e82fa1f01d7f0d7706b9d3e2efaa9a31cc0777f6;p=fa-stable.git
diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index 8de53227..a08a17e4 100644
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -1,28 +1,45 @@
.
+***********************************************************************/
+$page_security = 'SA_GLACCOUNTCLASS';
+$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
-page(_("GL Account Classes"));
+page(_($help_context = "GL Account Classes"));
include($path_to_root . "/gl/includes/gl_db.inc");
include($path_to_root . "/includes/ui.inc");
-simple_page_mode(true);
+simple_page_mode(false);
//-----------------------------------------------------------------------------------
function can_process()
{
+ global $SysPrefs;
- if (strlen($_POST['name']) == 0)
+ if (strlen(trim($_POST['id'])) == 0)
+ {
+ display_error( _("The account class ID cannot be empty."));
+ set_focus('id');
+ return false;
+ }
+ if (strlen(trim($_POST['name'])) == 0)
{
display_error( _("The account class name cannot be empty."));
set_focus('name');
return false;
}
-
+ if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
+ $_POST['Balance'] = check_value('Balance');
return true;
}
@@ -34,17 +51,18 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
if (can_process())
{
- if ($selected_id != -1)
+ if ($selected_id != "")
{
- update_account_class($selected_id, $_POST['name'], $_POST['Balance']);
- 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'));
}
else
{
- add_account_class($_POST['id'], $_POST['name'], $_POST['Balance']);
- display_notification(_('New account class has been added'));
+ if(add_account_class($_POST['id'], $_POST['name'], $_POST['ctype'])) {
+ display_notification(_('New account class has been added'));
+ $Mode = 'RESET';
+ }
}
- $Mode = 'RESET';
}
}
@@ -52,13 +70,9 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
function can_delete($selected_id)
{
- if ($selected_id == -1)
+ if ($selected_id == "")
return false;
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types
- WHERE class_id=$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($selected_id, 'chart_types', 'class_id'))
{
display_error(_("Cannot delete this account class because GL account types have been created referring to it."));
return false;
@@ -84,59 +98,60 @@ if ($Mode == 'Delete')
//-----------------------------------------------------------------------------------
if ($Mode == 'RESET')
{
- $selected_id = -1;
- $_POST['id'] = $_POST['name'] = $_POST['Balance'] = '';
+ $selected_id = "";
+ $_POST['id'] = $_POST['name'] = $_POST['ctype'] = '';
}
//-----------------------------------------------------------------------------------
-$result = get_account_classes();
+$result = get_account_classes(check_value('show_inactive'));
+
start_form();
-start_table($table_style);
-$th = array(_("Class ID"), _("Class Name"), _("Balance Sheet"), "", "");
+start_table(TABLESTYLE);
+$th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
+if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
+ $th[2] = _("Balance Sheet");
+inactive_control_column($th);
table_header($th);
$k = 0;
while ($myrow = db_fetch($result))
{
-
alt_table_row_color($k);
- if ($myrow["balance_sheet"] == 0)
- {
- $bs_text = _("No");
- }
- else
- {
- $bs_text = _("Yes");
- }
label_cell($myrow["cid"]);
- label_cell($myrow['class_name']);
- label_cell($bs_text);
+ label_cell(''.$myrow['class_name'].'');
+ 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")));
+ }
+ else
+ label_cell($class_types[$myrow["ctype"]]);
+ inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid');
edit_button_cell("Edit".$myrow["cid"], _("Edit"));
- edit_button_cell("Delete".$myrow["cid"], _("Delete"));
+ delete_button_cell("Delete".$myrow["cid"], _("Delete"));
end_row();
}
-
-end_table();
-end_form();
-echo '
';
+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') {
- //editing an existing status code
- $myrow = get_account_class($selected_id);
-
- $_POST['id'] = $myrow["cid"];
- $_POST['name'] = $myrow["class_name"];
- $_POST['Balance'] = $myrow["balance_sheet"];
- hidden('selected_id', $selected_id);
- }
+ if ($Mode == 'Edit') {
+ //editing an existing status code
+ $myrow = get_account_class($selected_id);
+
+ $_POST['id'] = $myrow["cid"];
+ $_POST['name'] = $myrow["class_name"];
+ 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"];
+ hidden('selected_id', $selected_id);
+ }
hidden('id');
label_row(_("Class ID:"), $_POST['id']);
@@ -149,11 +164,14 @@ else
text_row_ex(_("Class Name:"), 'name', 50, 60);
-yesno_list_row(_("Balance Sheet:"), 'Balance', null, "", "", false);
+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);
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == "", '', 'both');
end_form();
@@ -161,4 +179,3 @@ end_form();
end_page();
-?>