X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fmanage%2Fgl_accounts.php;h=718be9bd872f692f7b257154933e348a60c8fe65;hb=56631aa65f39f4f2471f1e31350f5b6c912cabbf;hp=1a10f41423395fb8eaff9821279ac4deb84c635d;hpb=97023f8706bb7149c62ca49eaec123cca3c51fa0;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 1a10f414..718be9bd 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_GLACCOUNT'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); page(_("Chart of Accounts")); @@ -14,9 +23,10 @@ check_db_has_gl_account_groups(_("There are no account groups defined. Please de //------------------------------------------------------------------------------------- -if (isset($_POST['Select'])) +if (isset($_POST['_AccountList_update'])) { $_POST['selected_account'] = $_POST['AccountList']; + unset($_POST['account_code']); } if (isset($_POST['selected_account'])) @@ -41,27 +51,45 @@ if (isset($_POST['add']) || isset($_POST['update'])) { $input_error = 1; display_error( _("The account code must be entered.")); + set_focus('account_code'); } elseif (strlen($_POST['account_name']) == 0) { $input_error = 1; display_error( _("The account name cannot be empty.")); + set_focus('account_name'); } elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) { $input_error = 1; display_error( _("The account code must be numeric.")); + set_focus('account_code'); } if ($input_error != 1) { if ($accounts_alpha == 2) $_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']); - else - add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']); - meta_forward($_SERVER['PHP_SELF']); + if ($selected_account) + { + if (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 + { + if (add_gl_account($_POST['account_code'], $_POST['account_name'], + $_POST['account_type'], $_POST['account_code2'])) + { + display_notification(_("New account has been added.")); + $selected_account = $_POST['AccountList'] = $_POST['account_code']; + } + } + $Ajax->activate('_page_body'); } } @@ -84,10 +112,6 @@ function can_delete($selected_account) $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' OR pyt_discount_act='$selected_account' OR creditors_act='$selected_account' - OR grn_act='$selected_account' - OR exchange_diff_act='$selected_account' - OR purch_exchange_diff_act='$selected_account' - OR retained_earnings_act='$selected_account' OR freight_act='$selected_account' OR default_sales_act='$selected_account' OR default_sales_discount_act='$selected_account' @@ -96,8 +120,7 @@ function can_delete($selected_account) OR default_cogs_act='$selected_account' OR default_adj_act='$selected_account' OR default_inv_sales_act='$selected_account' - OR default_assembly_act='$selected_account' - OR payroll_act='$selected_account'"; + OR default_assembly_act='$selected_account'"; $result = db_query($sql,"Couldn't test for default company GL codes"); $myrow = db_fetch_row($result); @@ -168,6 +191,17 @@ function can_delete($selected_account) return false; } + $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE + dest_id='$selected_account' AND UPPER(LEFT(action, 1)) <> 'T'"; + $result = db_query($sql,"Couldn't test for existing suppliers GL codes"); + + $myrow = db_fetch_row($result); + if ($myrow[0] > 0) + { + display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines.")); + return false; + } + return true; } @@ -179,7 +213,10 @@ if (isset($_POST['delete'])) if (can_delete($selected_account)) { delete_gl_account($selected_account); - meta_forward($_SERVER['PHP_SELF']); + $selected_account = $_POST['AccountList'] = ''; + display_notification(_("Selected account has been deleted")); + unset($_POST['account_code']); + $Ajax->activate('_page_body'); } } @@ -189,17 +226,20 @@ start_form(); if (db_has_gl_accounts()) { - echo "
"; - echo _("Select an Account:") . " "; - gl_all_accounts_list('AccountList', null); - echo " "; - submit('Select', _("Edit Account")); - 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'); + } +} -hyperlink_no_params($_SERVER['PHP_SELF'], _("New Account")); br(1); - start_table($table_style2); if ($selected_account != "") @@ -211,15 +251,20 @@ 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', $_POST['selected_account']); + hidden('selected_account', $selected_account); label_row(_("Account Code:"), $_POST['account_code']); } -else +else { + if (!isset($_POST['account_code'])) { + $_POST['account_code'] = $_POST['account_code2'] = ''; + $_POST['account_name'] = $_POST['account_type'] = ''; + $_POST['inactive'] = 0; + } text_row_ex(_("Account Code:"), 'account_code', 11); } @@ -229,20 +274,18 @@ text_row_ex(_("Account Name:"), 'account_name', 60); gl_account_types_list_row(_("Account Group:"), 'account_type', null); -tax_types_list_row(_("Tax Type:"), 'tax_code', null, true, _('No Tax')); - +record_status_list_row(_("Account status:"), 'inactive'); end_table(1); if ($selected_account == "") { - submit_center('add', _("Add Account")); + submit_center('add', _("Add Account"), true, '', 'default'); } else { - submit_center_first('update', _("Update Account")); - submit_center_last('delete', _("Delete account")); + submit_center_first('update', _("Update Account"), '', 'default'); + submit_center_last('delete', _("Delete account"), '',true); } - end_form(); end_page();