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 from main branch up to 2.1.3.
[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 47651ef9b5a15fdd6df69275ca4e6240bea082b9..7df38e2c4e65eca630e37df3b67bbc17b951435c 100644
(file)
--- a/
gl/manage/gl_account_classes.php
+++ b/
gl/manage/gl_account_classes.php
@@
-50,12
+50,12
@@
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
if ($selected_id != -1)
{
if ($selected_id != -1)
{
- update_account_class($selected_id, $_POST['name'], $_POST['Balance']);
+ update_account_class($selected_id, $_POST['name'], $_POST['Balance']
, $_POST['convert']
);
display_notification(_('Selected account class settings has been updated'));
}
else
{
display_notification(_('Selected account class settings has been updated'));
}
else
{
- add_account_class($_POST['id'], $_POST['name'], $_POST['Balance']);
+ add_account_class($_POST['id'], $_POST['name'], $_POST['Balance']
, $_POST['convert']
);
display_notification(_('New account class has been added'));
}
$Mode = 'RESET';
display_notification(_('New account class has been added'));
}
$Mode = 'RESET';
@@
-99,14
+99,16
@@
if ($Mode == 'Delete')
if ($Mode == 'RESET')
{
$selected_id = -1;
if ($Mode == 'RESET')
{
$selected_id = -1;
- $_POST['id'] = $_POST['name'] = $_POST['Balance'] = '';
+ $_POST['id'] = $_POST['name'] = $_POST['Balance'] =
$_POST['sign_convert'] =
'';
}
//-----------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------
-$result = get_account_classes();
+$result = get_account_classes(check_value('show_inactive'));
+
start_form();
start_table($table_style);
start_form();
start_table($table_style);
-$th = array(_("Class ID"), _("Class Name"), _("Balance Sheet"), "", "");
+$th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
+inactive_control_column($th);
table_header($th);
$k = 0;
table_header($th);
$k = 0;
@@
-115,29
+117,18
@@
while ($myrow = db_fetch($result))
alt_table_row_color($k);
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($myrow["cid"]);
label_cell($myrow['class_name']);
- label_cell($bs_text);
+ label_cell($class_types[$myrow["balance_sheet"]]);
+ inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid');
edit_button_cell("Edit".$myrow["cid"], _("Edit"));
delete_button_cell("Delete".$myrow["cid"], _("Delete"));
end_row();
}
edit_button_cell("Edit".$myrow["cid"], _("Edit"));
delete_button_cell("Delete".$myrow["cid"], _("Delete"));
end_row();
}
-
-end_table();
-end_form();
-echo '<br>';
+inactive_control_row($th);
+end_table(1);
//-----------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------
-start_form();
-
start_table($table_style2);
if ($selected_id != -1)
start_table($table_style2);
if ($selected_id != -1)
@@
-149,6
+140,7
@@
if ($selected_id != -1)
$_POST['id'] = $myrow["cid"];
$_POST['name'] = $myrow["class_name"];
$_POST['Balance'] = $myrow["balance_sheet"];
$_POST['id'] = $myrow["cid"];
$_POST['name'] = $myrow["class_name"];
$_POST['Balance'] = $myrow["balance_sheet"];
+ $_POST['convert'] = $myrow["sign_convert"];
hidden('selected_id', $selected_id);
}
hidden('id');
hidden('selected_id', $selected_id);
}
hidden('id');
@@
-163,7
+155,9
@@
else
text_row_ex(_("Class Name:"), 'name', 50, 60);
text_row_ex(_("Class Name:"), 'name', 50, 60);
-yesno_list_row(_("Balance Sheet:"), 'Balance', null, "", "", false);
+class_types_list_row(_("Class Type:"), 'Balance', null);
+
+yesno_list_row(_("Sign Convert (Balance Sheet/PL statement):"), 'convert', null, "", "", false);
end_table(1);
end_table(1);