X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=c78becaa1605fd725238840aeddb6cec4bcd915e;hb=ce80130dd1e2226e9d1efd57611f0c34af2eea95;hp=5c88705d83c8f9bcd0c7943eccf725d62d775449;hpb=fbb7a3d6150e02e442bd763a717915649fb43437;p=fa-stable.git
diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 5c88705d..c78becaa 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 10;
$path_to_root="../..";
include($path_to_root . "/includes/session.inc");
@@ -62,12 +71,17 @@ if (isset($_POST['add']) || isset($_POST['update']))
$_POST['account_code'] = strtoupper($_POST['account_code']);
if ($selected_account)
{
- update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);
+ update_gl_account($_POST['account_code'], $_POST['account_name'],
+ $_POST['account_type'], $_POST['account_code2']);
+ update_record_status($_POST['account_code'], $_POST['inactive'],
+ 'chart_master', 'account_code');
+ $Ajax->activate('account_code'); // in case of status change
display_notification(_("Account data has been updated."));
}
else
{
- add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);
+ add_gl_account($_POST['account_code'], $_POST['account_name'],
+ $_POST['account_type'], $_POST['account_code2']);
$selected_account = $_POST['AccountList'] = $_POST['account_code'];
display_notification(_("New account has been added."));
}
@@ -196,11 +210,17 @@ start_form();
if (db_has_gl_accounts())
{
- echo "
";
- echo _("Select an Account:") . " ";
- gl_all_accounts_list('AccountList', null, false, false,
- _('New account'), true);
- echo "";
+ start_table("class = 'tablestyle_noborder'");
+ start_row();
+ gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
+ _('New account'), true, check_value('show_inactive'));
+ check_cells(_("Show inactive:"), 'show_inactive', null, true);
+ end_row();
+ end_table();
+ if (get_post('_show_inactive_update')) {
+ $Ajax->activate('AccountList');
+ set_focus('AccountList');
+ }
}
br(1);
@@ -215,7 +235,7 @@ if ($selected_account != "")
$_POST['account_code2'] = $myrow["account_code2"];
$_POST['account_name'] = $myrow["account_name"];
$_POST['account_type'] = $myrow["account_type"];
- $_POST['tax_code'] = $myrow["tax_code"];
+ $_POST['inactive'] = $myrow["inactive"];
hidden('account_code', $_POST['account_code']);
hidden('selected_account', $selected_account);
@@ -225,7 +245,8 @@ if ($selected_account != "")
else
{
$_POST['account_code'] = $_POST['account_code2'] = '';
- $_POST['account_name'] = $_POST['account_type'] = $_POST['tax_code'] = '';
+ $_POST['account_name'] = $_POST['account_type'] = '';
+ $_POST['inactive'] = 0;
text_row_ex(_("Account Code:"), 'account_code', 11);
}
@@ -235,17 +256,16 @@ text_row_ex(_("Account Name:"), 'account_name', 60);
gl_account_types_list_row(_("Account Group:"), 'account_type', null);
-tax_groups_list_row(_("Tax Group:"), 'tax_code', null, _('No Tax'));
-
+record_status_list_row(_("Account status:"), 'inactive');
end_table(1);
if ($selected_account == "")
{
- submit_center('add', _("Add Account"), true, '', true);
+ submit_center('add', _("Add Account"), true, '', 'default');
}
else
{
- submit_center_first('update', _("Update Account"), '', true);
+ submit_center_first('update', _("Update Account"), '', 'default');
submit_center_last('delete', _("Delete account"), '',true);
}
end_form();