projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Items: fixed item tax type selector to exclude inactive item tax types.
[fa-stable.git]
/
gl
/
manage
/
gl_accounts.php
diff --git
a/gl/manage/gl_accounts.php
b/gl/manage/gl_accounts.php
index 7b1937fdbc1f7a79c3d62d9c98580a13e105cfdf..5bda0dcdff4047d4e6daa5d6b1886fc0b3e8556c 100644
(file)
--- a/
gl/manage/gl_accounts.php
+++ b/
gl/manage/gl_accounts.php
@@
-13,7
+13,11
@@
$page_security = 'SA_GLACCOUNT';
$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
-page(_($help_context = "Chart of Accounts"));
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+ $js .= get_js_open_window(900, 500);
+
+page(_($help_context = "Chart of Accounts"), false, false, "", $js);
include($path_to_root . "/includes/ui.inc");
include($path_to_root . "/gl/includes/gl_db.inc");
include($path_to_root . "/includes/ui.inc");
include($path_to_root . "/gl/includes/gl_db.inc");
@@
-47,28
+51,27
@@
if (isset($_POST['add']) || isset($_POST['update']))
$input_error = 0;
$input_error = 0;
- if (strlen(
$_POST['account_code']
) == 0)
+ if (strlen(
trim($_POST['account_code'])
) == 0)
{
$input_error = 1;
display_error( _("The account code must be entered."));
set_focus('account_code');
}
{
$input_error = 1;
display_error( _("The account code must be entered."));
set_focus('account_code');
}
- elseif (strlen(
$_POST['account_name']
) == 0)
+ elseif (strlen(
trim($_POST['account_name'])
) == 0)
{
$input_error = 1;
display_error( _("The account name cannot be empty."));
set_focus('account_name');
}
{
$input_error = 1;
display_error( _("The account name cannot be empty."));
set_focus('account_name');
}
- elseif (!$
accounts_alpha && !is_numeric($_POST['account_code']))
+ elseif (!$
SysPrefs->accounts_alpha() && !preg_match("/^[0-9.]+$/",$_POST['account_code'])) // we only allow 0-9 and a dot
{
$input_error = 1;
display_error( _("The account code must be numeric."));
set_focus('account_code');
}
{
$input_error = 1;
display_error( _("The account code must be numeric."));
set_focus('account_code');
}
-
if ($input_error != 1)
{
if ($input_error != 1)
{
- if ($
accounts_alpha
== 2)
+ if ($
SysPrefs->accounts_alpha()
== 2)
$_POST['account_code'] = strtoupper($_POST['account_code']);
if (!isset($_POST['account_tags']))
$_POST['account_code'] = strtoupper($_POST['account_code']);
if (!isset($_POST['account_tags']))
@@
-76,7
+79,11
@@
if (isset($_POST['add']) || isset($_POST['update']))
if ($selected_account)
{
if ($selected_account)
{
- if (update_gl_account($_POST['account_code'], $_POST['account_name'],
+ if (get_post('inactive') == 1 && is_bank_account($_POST['account_code']))
+ {
+ display_error(_("The account belongs to a bank account and cannot be inactivated."));
+ }
+ elseif (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');
$_POST['account_type'], $_POST['account_code2'])) {
update_record_status($_POST['account_code'], $_POST['inactive'],
'chart_master', 'account_code');
@@
-95,6
+102,8
@@
if (isset($_POST['add']) || isset($_POST['update']))
display_notification(_("New account has been added."));
$selected_account = $_POST['AccountList'] = $_POST['account_code'];
}
display_notification(_("New account has been added."));
$selected_account = $_POST['AccountList'] = $_POST['account_code'];
}
+ else
+ display_error(_("Account not added, possible duplicate Account Code."));
}
$Ajax->activate('_page_body');
}
}
$Ajax->activate('_page_body');
}
@@
-106,61
+115,59
@@
function can_delete($selected_account)
{
if ($selected_account == "")
return false;
{
if ($selected_account == "")
return false;
- $acc = db_escape($selected_account);
- if (key_in_foreign_table($
acc, 'gl_trans', 'account', true
))
+ if (key_in_foreign_table($
selected_account, 'gl_trans', 'account'
))
{
display_error(_("Cannot delete this account because transactions have been created using this account."));
return false;
}
{
display_error(_("Cannot delete this account because transactions have been created using this account."));
return false;
}
- if (gl_account_in_company_defaults($
acc
))
+ if (gl_account_in_company_defaults($
selected_account
))
{
display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
return false;
}
{
display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
return false;
}
- if (key_in_foreign_table($
acc, 'bank_accounts', 'account_code', true))
+ if (key_in_foreign_table($
selected_account, 'bank_accounts', 'account_code'))
{
display_error(_("Cannot delete this account because it is used by a bank account."));
return false;
{
display_error(_("Cannot delete this account because it is used by a bank account."));
return false;
- }
+ }
- if (gl_account_in_stock_category($
acc
))
+ if (gl_account_in_stock_category($
selected_account
))
{
display_error(_("Cannot delete this account because it is used by one or more Item Categories."));
return false;
{
display_error(_("Cannot delete this account because it is used by one or more Item Categories."));
return false;
- }
-
- if (gl_account_in_stock_master($
acc
))
+ }
+
+ if (gl_account_in_stock_master($
selected_account
))
{
display_error(_("Cannot delete this account because it is used by one or more Items."));
return false;
{
display_error(_("Cannot delete this account because it is used by one or more Items."));
return false;
- }
-
- if (gl_account_in_tax_types($
acc
))
+ }
+
+ if (gl_account_in_tax_types($
selected_account
))
{
display_error(_("Cannot delete this account because it is used by one or more Taxes."));
return false;
{
display_error(_("Cannot delete this account because it is used by one or more Taxes."));
return false;
- }
-
- if (gl_account_in_cust_branch($
acc
))
+ }
+
+ if (gl_account_in_cust_branch($
selected_account
))
{
display_error(_("Cannot delete this account because it is used by one or more Customer Branches."));
return false;
{
display_error(_("Cannot delete this account because it is used by one or more Customer Branches."));
return false;
- }
-
- if (gl_account_in_suppliers($acc))
+ }
+ if (gl_account_in_suppliers($selected_account))
{
display_error(_("Cannot delete this account because it is used by one or more suppliers."));
return false;
{
display_error(_("Cannot delete this account because it is used by one or more suppliers."));
return false;
- }
-
- if (gl_account_in_quick_entry_lines($
acc
))
+ }
+
+ if (gl_account_in_quick_entry_lines($
selected_account
))
{
display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
return false;
{
display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
return false;
- }
+ }
return true;
}
return true;
}
@@
-188,7
+195,7
@@
start_form();
if (db_has_gl_accounts())
{
if (db_has_gl_accounts())
{
- start_table(
"class = 'tablestyle_noborder'"
);
+ start_table(
TABLESTYLE_NOBORDER
);
start_row();
gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
_('New account'), true, check_value('show_inactive'));
start_row();
gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
_('New account'), true, check_value('show_inactive'));
@@
-202,7
+209,7
@@
if (db_has_gl_accounts())
}
br(1);
}
br(1);
-start_table(
$table_style
2);
+start_table(
TABLESTYLE
2);
if ($selected_account != "")
{
if ($selected_account != "")
{
@@
-234,10
+241,10
@@
else
$_POST['account_name'] = $_POST['account_type'] = '';
$_POST['inactive'] = 0;
}
$_POST['account_name'] = $_POST['account_type'] = '';
$_POST['inactive'] = 0;
}
- text_row_ex(_("Account Code:"), 'account_code', 1
1
);
+ text_row_ex(_("Account Code:"), 'account_code', 1
5
);
}
}
-text_row_ex(_("Account Code 2:"), 'account_code2', 1
1
);
+text_row_ex(_("Account Code 2:"), 'account_code2', 1
5
);
text_row_ex(_("Account Name:"), 'account_name', 60);
text_row_ex(_("Account Name:"), 'account_name', 60);
@@
-261,4
+268,3
@@
end_form();
end_page();
end_page();
-?>