projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed improper checks on GL account deletion.
[fa-stable.git]
/
gl
/
manage
/
gl_accounts.php
diff --git
a/gl/manage/gl_accounts.php
b/gl/manage/gl_accounts.php
index 345d3791fa8a17e21e71fbfc15858e30286932e9..db432dcc288209332c2ed9b92f1b285385f5f7e6 100644
(file)
--- a/
gl/manage/gl_accounts.php
+++ b/
gl/manage/gl_accounts.php
@@
-110,61
+110,60
@@
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', true))
{
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', true))
{
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;
}